Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt wording and translations #681

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Adapt wording and translations #681

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cd5048
Adapt wording and translations
codingjoe Apr 29, 2024
0f51648
Merge branch 'master' into issues/677
codingjoe Apr 29, 2024
605e71e
Apply suggestions from code review
codingjoe Apr 29, 2024
dc35280
Apply suggestions from code review
codingjoe May 3, 2024
4b1a075
Make snackbar actions more verbose
codingjoe May 3, 2024
870257d
Apply suggestions from code review
codingjoe May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

![Screenshot of the notification seen while hijacking another user.](https://github.com/django-hijack/django-hijack/raw/master/docs/django-hijack.jpg)

With Django Hijack, admins can log in and work on behalf of other users without having to know their credentials.
With Django Hijack, admins can impersonate and work on behalf of other users without having to know their credentials.

## Docs

Expand Down
2 changes: 1 addition & 1 deletion hijack/contrib/admin/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def get_changelist_instance(self, request):
def hijack_field(obj):
return self.hijack_button(request, obj)

hijack_field.short_description = _("hijack user")
hijack_field.short_description = _("impersonate user")
codingjoe marked this conversation as resolved.
Show resolved Hide resolved

# we
list_display = [*self.get_list_display(request), hijack_field]
Expand Down
5 changes: 3 additions & 2 deletions hijack/contrib/admin/templates/hijack/contrib/admin/button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<button type="button" class="button" data-hijack-user="{{ another_user.pk|unlocalize }}"
data-hijack-next="{{ next }}" data-hijack-url="{% url 'hijack:acquire' %}">
{% if is_user_admin %}
{% trans 'hijack'|upper %}
{% translate 'impersonate'|capfirst context 'verb' %}
{% else %}
{% blocktrans %}Hijack {{ username }}{% endblocktrans %}
{% blocktrans as "cta" %}impersonate {{ username }}{% endblocktrans %}
{{ cta|capfirst }}
{% endif %}
</button>
{% endif %}
39 changes: 21 additions & 18 deletions hijack/locale/cs/LC_MESSAGES/django.po
View file
Open in desktop
codingjoe marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,42 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-03-14 11:27+0100\n"
"PO-Revision-Date: 2021-03-14 11:29+0100\n"
"Last-Translator: Johannes Maron <info@johanneshoppe.com>\n"
"POT-Creation-Date: 2024-04-29 13:23+0200\n"
"PO-Revision-Date: 2024-04-29 13:25+0200\n"
"Last-Translator: Johannes Maron <johannes@maron.family>\n"
"Language-Team: \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Poedit 2.4.2\n"
"X-Generator: Poedit 3.4.2\n"

#: contrib/admin/admin.py:35
msgid "hijack user"
msgstr "unést uživatele"
#: contrib/admin/admin.py:64
msgid "impersonate user"
msgstr "vydávat se za uživatele"

#: contrib/admin/templates/hijack/contrib/admin/button.html:8
msgid "hijack"
msgstr "únos"
#: contrib/admin/templates/hijack/contrib/admin/button.html:7
msgctxt "verb"
msgid "impersonate"
msgstr "vydávat se za"

#: contrib/admin/templates/hijack/contrib/admin/button.html:11
#: contrib/admin/templates/hijack/contrib/admin/button.html:9
#, python-format
msgid "Hijack %(username)s"
msgstr "Uvolnit %(username)s"
msgid "impersonate %(username)s"
msgstr "uvolnit %(username)s"

#: templates/hijack/notification.html:7
#: templates/hijack/notification.html:8
#, python-format
msgid "You are currently working on behalf of <em>%(user)s</em>."
msgstr "Nyní pracujete jménem uživatele <em>%(user)s</em>."

#: templates/hijack/notification.html:15
#: templates/hijack/notification.html:16
msgctxt "verb"
msgid "hide"
msgstr "schovat"

#: templates/hijack/notification.html:18
msgid "release"
msgstr "uvolnit"
#: templates/hijack/notification.html:19
msgctxt "verb"
msgid "stop"
msgstr "stop"
39 changes: 21 additions & 18 deletions hijack/locale/da/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,42 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-03-14 11:27+0100\n"
"PO-Revision-Date: 2021-03-14 11:31+0100\n"
"Last-Translator: Johannes Maron <info@johanneshoppe.com>\n"
"POT-Creation-Date: 2024-04-29 13:23+0200\n"
"PO-Revision-Date: 2024-04-29 13:25+0200\n"
"Last-Translator: Johannes Maron <johannes@maron.family>\n"
"Language-Team: \n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.4.2\n"
"X-Generator: Poedit 3.4.2\n"

#: contrib/admin/admin.py:35
msgid "hijack user"
msgstr "kapre bruger"
#: contrib/admin/admin.py:64
msgid "impersonate user"
msgstr "udgive sig for at være bruger"

#: contrib/admin/templates/hijack/contrib/admin/button.html:8
msgid "hijack"
msgstr "kapre"
#: contrib/admin/templates/hijack/contrib/admin/button.html:7
msgctxt "verb"
msgid "impersonate"
msgstr "udgive sig for at være"

#: contrib/admin/templates/hijack/contrib/admin/button.html:11
#: contrib/admin/templates/hijack/contrib/admin/button.html:9
#, python-format
msgid "Hijack %(username)s"
msgstr "Kapre %(username)s"
msgid "impersonate %(username)s"
msgstr "kapre %(username)s"

#: templates/hijack/notification.html:7
#: templates/hijack/notification.html:8
#, python-format
msgid "You are currently working on behalf of <em>%(user)s</em>."
msgstr "Du er i øjeblikket logget ind på vegne af <em>%(user)s</em>."

#: templates/hijack/notification.html:15
#: templates/hijack/notification.html:16
msgctxt "verb"
msgid "hide"
msgstr "skjul"

#: templates/hijack/notification.html:18
msgid "release"
msgstr "frigør"
#: templates/hijack/notification.html:19
msgctxt "verb"
msgid "stop"
msgstr "trinbræt"
35 changes: 19 additions & 16 deletions hijack/locale/de/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,42 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-03-14 11:27+0100\n"
"PO-Revision-Date: 2021-03-14 11:34+0100\n"
"Last-Translator: Johannes Maron <info@johanneshoppe.com>\n"
"POT-Creation-Date: 2024-04-29 13:23+0200\n"
"PO-Revision-Date: 2024-04-29 13:25+0200\n"
"Last-Translator: Johannes Maron <johannes@maron.family>\n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.4.2\n"
"X-Generator: Poedit 3.4.2\n"

#: contrib/admin/admin.py:35
msgid "hijack user"
msgstr "Nutzer übernehmen"
#: contrib/admin/admin.py:64
msgid "impersonate user"
msgstr "Benutzer übernehmen"

#: contrib/admin/templates/hijack/contrib/admin/button.html:8
msgid "hijack"
#: contrib/admin/templates/hijack/contrib/admin/button.html:7
msgctxt "verb"
msgid "impersonate"
msgstr "übernehmen"

#: contrib/admin/templates/hijack/contrib/admin/button.html:11
#: contrib/admin/templates/hijack/contrib/admin/button.html:9
#, python-format
msgid "Hijack %(username)s"
msgid "impersonate %(username)s"
msgstr "%(username)s übernehmen"

#: templates/hijack/notification.html:7
#: templates/hijack/notification.html:8
#, python-format
msgid "You are currently working on behalf of <em>%(user)s</em>."
msgstr "Sie arbeiten mit dem Account von <em>%(user)s</em>."

#: templates/hijack/notification.html:15
#: templates/hijack/notification.html:16
msgctxt "verb"
msgid "hide"
msgstr "ausblenden"

#: templates/hijack/notification.html:18
msgid "release"
msgstr "beenden"
#: templates/hijack/notification.html:19
msgctxt "verb"
msgid "stop"
msgstr "Stop"
39 changes: 21 additions & 18 deletions hijack/locale/es/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,41 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-03-14 11:27+0100\n"
"PO-Revision-Date: 2021-11-03 22:15-0500\n"
"Last-Translator: Daniel Garcia <daniel@danielgarcia.co>\n"
"POT-Creation-Date: 2024-04-29 13:23+0200\n"
"PO-Revision-Date: 2024-04-29 13:25+0200\n"
"Last-Translator: Johannes Maron <johannes@maron.family>\n"
"Language-Team: \n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.2\n"
"X-Generator: Poedit 3.4.2\n"

#: contrib/admin/admin.py:35
msgid "hijack user"
msgstr "suplantar al usuario"
#: contrib/admin/admin.py:64
msgid "impersonate user"
msgstr "suplantar usuario"

#: contrib/admin/templates/hijack/contrib/admin/button.html:8
msgid "hijack"
msgstr "suplantar"
#: contrib/admin/templates/hijack/contrib/admin/button.html:7
msgctxt "verb"
msgid "impersonate"
msgstr "hacerse pasar por"

#: contrib/admin/templates/hijack/contrib/admin/button.html:11
#: contrib/admin/templates/hijack/contrib/admin/button.html:9
#, python-format
msgid "Hijack %(username)s"
msgstr "Suplantar a %(username)s"
msgid "impersonate %(username)s"
msgstr "suplantar a %(username)s"

#: templates/hijack/notification.html:7
#: templates/hijack/notification.html:8
#, python-format
msgid "You are currently working on behalf of <em>%(user)s</em>."
msgstr "Actualmente estás trabajando a nombre de <em>%(user)s</em>."

#: templates/hijack/notification.html:15
#: templates/hijack/notification.html:16
msgctxt "verb"
msgid "hide"
msgstr "ocultar"

#: templates/hijack/notification.html:18
msgid "release"
msgstr "liberar"
#: templates/hijack/notification.html:19
msgctxt "verb"
msgid "stop"
msgstr "detiene"
39 changes: 21 additions & 18 deletions hijack/locale/fr/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-03-14 11:27+0100\n"
"PO-Revision-Date: 2021-03-14 11:35+0100\n"
"Last-Translator: Johannes Maron <info@johanneshoppe.com>\n"
"POT-Creation-Date: 2024-04-29 13:23+0200\n"
"PO-Revision-Date: 2024-04-29 13:25+0200\n"
"Last-Translator: Johannes Maron <johannes@maron.family>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
Expand All @@ -13,30 +13,33 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Language: fr\n"
"X-Source-Language: en\n"
"X-Generator: Poedit 2.4.2\n"
"X-Generator: Poedit 3.4.2\n"

#: contrib/admin/admin.py:35
msgid "hijack user"
msgstr "détourner un utilisateur"
#: contrib/admin/admin.py:64
msgid "impersonate user"
msgstr "usurper l'identité d'un utilisateur"
codingjoe marked this conversation as resolved.
Show resolved Hide resolved

#: contrib/admin/templates/hijack/contrib/admin/button.html:8
msgid "hijack"
msgstr "détourner"
#: contrib/admin/templates/hijack/contrib/admin/button.html:7
msgctxt "verb"
msgid "impersonate"
msgstr "se faire passer pour quelqu'un d'autre"
codingjoe marked this conversation as resolved.
Show resolved Hide resolved

#: contrib/admin/templates/hijack/contrib/admin/button.html:11
#: contrib/admin/templates/hijack/contrib/admin/button.html:9
#, python-format
msgid "Hijack %(username)s"
msgstr "Détourner %(username)s"
msgid "impersonate %(username)s"
msgstr "détourner %(username)s"

#: templates/hijack/notification.html:7
#: templates/hijack/notification.html:8
#, python-format
msgid "You are currently working on behalf of <em>%(user)s</em>."
msgstr "Vous endossez actuellement l'identité de <em>%(user)s</em>."

#: templates/hijack/notification.html:15
#: templates/hijack/notification.html:16
msgctxt "verb"
msgid "hide"
msgstr "masquer"

#: templates/hijack/notification.html:18
msgid "release"
msgstr "libérer"
#: templates/hijack/notification.html:19
msgctxt "verb"
msgid "stop"
msgstr "arrêter"
36 changes: 20 additions & 16 deletions hijack/locale/ja/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,42 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-15 07:56+0900\n"
"PO-Revision-Date: 2023-03-15 07:56+0900\n"
"Last-Translator: Kumamoto-Hamachi <onioni9999nagare@gmail.com>\n"
"POT-Creation-Date: 2024-04-29 13:23+0200\n"
"PO-Revision-Date: 2024-04-29 13:24+0200\n"
"Last-Translator: Johannes Maron <johannes@maron.family>\n"
"Language-Team: \n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 3.4.2\n"

#: hijack/contrib/admin/admin.py:64
msgid "hijack user"
msgstr "ユーザーハイジャック"
#: contrib/admin/admin.py:64
msgid "impersonate user"
msgstr "なりすましユーザー"
codingjoe marked this conversation as resolved.
Show resolved Hide resolved
codingjoe marked this conversation as resolved.
Show resolved Hide resolved

#: hijack/contrib/admin/templates/hijack/contrib/admin/button.html:7
msgid "hijack"
msgstr "ハイジャック"
#: contrib/admin/templates/hijack/contrib/admin/button.html:7
msgctxt "verb"
msgid "impersonate"
msgstr "なりすます"
codingjoe marked this conversation as resolved.
Show resolved Hide resolved

#: hijack/contrib/admin/templates/hijack/contrib/admin/button.html:9
#: contrib/admin/templates/hijack/contrib/admin/button.html:9
#, python-format
msgid "Hijack %(username)s"
msgid "impersonate %(username)s"
msgstr "%(username)sをハイジャック"
codingjoe marked this conversation as resolved.
Show resolved Hide resolved

#: hijack/templates/hijack/notification.html:8
#: templates/hijack/notification.html:8
#, python-format
msgid "You are currently working on behalf of <em>%(user)s</em>."
msgstr "現在、あなたは<em>%(user)s</em>の代理として作業しています。"

#: hijack/templates/hijack/notification.html:16
#: templates/hijack/notification.html:16
msgctxt "verb"
msgid "hide"
msgstr "非表示"

#: hijack/templates/hijack/notification.html:19
msgid "release"
msgstr "解放"
#: templates/hijack/notification.html:19
msgctxt "verb"
msgid "stop"
msgstr "停止"