Skip to content

Commit

Permalink
Merge pull request #32 from Gray-Advantage/dev
Browse files Browse the repository at this point in the history
Datanar 1.6.1
  • Loading branch information
Gray-Advantage authored Jun 12, 2024
2 parents b0abfa4 + 1c45bed commit a6c4b31
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion datanar/datanar/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions datanar/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion datanar/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion datanar/templates/includes/link_card.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit a6c4b31

Please sign in to comment.