Merge pull request #29 from Gray-Advantage/vladimir

Исправлены переводы на некоторых языках и копирование ссылок
Gray-Advantage · Jun 12, 2024 · 1c45bed · 1c45bed
2 parents bd386ce + 76a3ef4
commit 1c45bed
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/datanar/datanar/settings.py b/datanar/datanar/settings.py
@@ -7,7 +7,7 @@
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-VERSION = "1.6.0"
+VERSION = "1.6.1"
 
 SECRET_KEY = config(
     "DJANGO_SECRET_KEY",

diff --git a/datanar/locale/en/LC_MESSAGES/django.po b/datanar/locale/en/LC_MESSAGES/django.po
@@ -545,7 +545,7 @@ msgstr "Admin panel"
 
 #: .\templates\includes\header.html:68
 msgid "exit"
-msgstr "Exit"
+msgstr "Sign out"
 
 #: .\templates\includes\header.html:73 .\templates\users\login.html:13
 msgid "sign_in"
@@ -721,7 +721,7 @@ msgstr "Cancel"
 
 #: .\templates\users\email_change.html:31 .\templates\users\profile.html:23
 msgid "change_email"
-msgstr "Changing the email"
+msgstr "Change email"
 
 #: .\templates\users\login.html:5
 msgid "authorization"

diff --git a/datanar/locale/es/LC_MESSAGES/django.po b/datanar/locale/es/LC_MESSAGES/django.po
@@ -549,7 +549,7 @@ msgstr "Admin"
 
 #: .\templates\includes\header.html:68
 msgid "exit"
-msgstr "Salir"
+msgstr "Cerrar sesión"
 
 #: .\templates\includes\header.html:73 .\templates\users\login.html:13
 msgid "sign_in"

diff --git a/datanar/templates/includes/link_card.html b/datanar/templates/includes/link_card.html
@@ -10,7 +10,7 @@
       </a>
     </div>
     <div class="mt-1">
-      <button class="copy-text-field btn btn-outline-dark" data-link="{{ request.scheme }}://{{ request.get_host }}{% if '/' not in link.message %}/{% endif %}{{ link }}">{% trans "copy" %}</button>
+      <button class="copy-text-field btn btn-outline-dark" data-link="{{ request.scheme }}://{{ request.get_host }}{% if '/' not in link.message or '/' not in link %}/{% endif %}{{ link }}">{% trans "copy" %}</button>
       {% if request.user.is_authenticated %}
         {% if '/' not in link.message or '/' not in link %}
           <a class="btn btn-outline-dark" href="{% url 'statistic:link_detail' link "all_time" %}">{% trans "statistic" %}</a>