Skip to content

Commit 33a28c9

Browse files
fsbraunfsbraun
authored
fix: translation inconsistencies (#313)
* Add short_name method to Version model for consistent version naming * Update tests and compilemessages * Remove unnecessary import * Update messages * Update some strings
1 parent 9e1183a commit 33a28c9

File tree

12 files changed

+128
-124
lines changed

12 files changed

+128
-124
lines changed

‎djangocms_versioning/cms_toolbars.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,15 @@ def _add_revert_button(self, disabled=False):
143143
def _add_versioning_menu(self):
144144
""" Helper method to add version menu in the toolbar
145145
"""
146-
# Check if object is registered with versioning otherwise dont add
146+
# Check if object is registered with versioning otherwise don't add
147147
if not self._is_versioned():
148148
return
149149

150150
version = Version.objects.get_for_content(self.toolbar.obj)
151151
if version is None:
152152
return
153153

154-
version_menu_label = _("Version #{number} ({state})").format(
155-
number=version.number, state=version.state
156-
)
154+
version_menu_label = version.short_name()
157155
versioning_menu = self.toolbar.get_or_create_menu(
158156
VERSIONING_MENU_IDENTIFIER, version_menu_label, disabled=False
159157
)
@@ -167,7 +165,7 @@ def _add_versioning_menu(self):
167165
url = version_list_url(version.content)
168166
versioning_menu.add_sideframe_item(_("Manage Versions"), url=url)
169167
if version.source:
170-
name = _("Compare to {state} source").format(state=_(version.source.state))
168+
name = _("Compare to {source}").format(source=_(version.source.short_name()))
171169
proxy_model = self._get_proxy_model()
172170
url = reverse("admin:{app}_{model}_compare".format(
173171
app=proxy_model._meta.app_label, model=proxy_model.__name__.lower()

‎djangocms_versioning/locale/de/LC_MESSAGES/django.mo‎

9 Bytes
Binary file not shown.

‎djangocms_versioning/locale/de/LC_MESSAGES/django.po‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
33
# This file is distributed under the same license as the PACKAGE package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5-
#
5+
#
66
# Translators:
77
# Fabian Braun <[email protected]>, 2023
8-
#
8+
#
99
#, fuzzy
1010
msgid ""
1111
msgstr ""
1212
"Project-Id-Version: PACKAGE VERSION\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2023-01-22 19:30+0100\n"
14+
"POT-Creation-Date: 2023-01-23 10:56+0100\n"
1515
"PO-Revision-Date: 2023-01-10 15:29+0000\n"
1616
"Last-Translator: Fabian Braun <[email protected]>, 2023\n"
1717
"Language-Team: German (https://www.transifex.com/divio/teams/58664/de/)\n"
18+
"Language: de\n"
1819
"MIME-Version: 1.0\n"
1920
"Content-Type: text/plain; charset=UTF-8\n"
2021
"Content-Transfer-Encoding: 8bit\n"
21-
"Language: de\n"
2222
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2323

2424
#: admin.py:161
@@ -131,47 +131,41 @@ msgstr "Bearbeiten"
131131
msgid "Revert"
132132
msgstr "Zurückholen"
133133

134-
#: cms_toolbars.py:154
135-
#, python-brace-format
136-
msgid "Version #{number} ({state})"
137-
msgstr "Version #{number} ({state})"
138-
139-
#: cms_toolbars.py:168
134+
#: cms_toolbars.py:166
140135
msgid "Manage Versions"
141136
msgstr "Versionen verwalten"
142137

143-
#: cms_toolbars.py:170
144-
#, python-brace-format
145-
msgid "Compare to {state} source"
146-
msgstr "Mit Ursprungsversion ({state}) vergleichen"
138+
#: cms_toolbars.py:168
139+
msgid "Compare to {source}"
140+
msgstr "Mit {source} vergleichen"
147141

148-
#: cms_toolbars.py:211
142+
#: cms_toolbars.py:209
149143
msgid "View Published"
150144
msgstr "Veröffentlichung ansehen"
151145

152-
#: cms_toolbars.py:254
146+
#: cms_toolbars.py:252
153147
msgid "Language"
154148
msgstr "Sprache"
155149

156-
#: cms_toolbars.py:301
150+
#: cms_toolbars.py:299
157151
msgid "Add Translation"
158152
msgstr "Übersetzung hinzufügen"
159153

160-
#: cms_toolbars.py:314
154+
#: cms_toolbars.py:312
161155
msgid "Copy all plugins"
162156
msgstr "Alle Plugins kopieren"
163157

164-
#: cms_toolbars.py:316
158+
#: cms_toolbars.py:314
165159
#, python-format
166160
msgid "from %s"
167161
msgstr "von %s"
168162

169-
#: cms_toolbars.py:317
163+
#: cms_toolbars.py:315
170164
#, python-format
171165
msgid "Are you sure you want to copy all plugins from %s?"
172166
msgstr "Sind Sie sicher, dass sie alle Plugins von %s kopieren wollen?"
173167

174-
#: cms_toolbars.py:332
168+
#: cms_toolbars.py:330
175169
msgid "No other language available"
176170
msgstr "Keine andere Sprache verfügbar"
177171

@@ -245,23 +239,28 @@ msgstr "Ursprung"
245239
msgid "Version #{number} ({state} {date})"
246240
msgstr "Version #{number} ({state} {date}) "
247241

248-
#: models.py:224 models.py:271
242+
#: models.py:107
243+
#, python-brace-format
244+
msgid "Version #{number} ({state})"
245+
msgstr "Version #{number} ({state})"
246+
247+
#: models.py:229 models.py:276
249248
msgid "Version is not in draft state"
250249
msgstr "Version ist kein Entwurf"
251250

252-
#: models.py:331
251+
#: models.py:336
253252
msgid "Version is not in published state"
254253
msgstr "Version ist nicht veröffentlicht"
255254

256-
#: models.py:378 models.py:389
255+
#: models.py:383 models.py:394
257256
msgid "Version is not a draft"
258257
msgstr "Version ist kein Entwurf"
259258

260-
#: models.py:384
259+
#: models.py:389
261260
msgid "Version is not in archived or unpublished state"
262261
msgstr "Version ist weder archiviert noch eine Veröffentlichung aufgehoben"
263262

264-
#: models.py:395
263+
#: models.py:400
265264
msgid "Version is not in draft or published state"
266265
msgstr "Version ist weder ein Entwurf noch veröffentlicht"
267266

‎djangocms_versioning/locale/en/LC_MESSAGES/django.po‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2023-01-22 19:30+0100\n"
11+
"POT-Creation-Date: 2023-01-23 10:56+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -128,47 +128,42 @@ msgstr ""
128128
msgid "Revert"
129129
msgstr ""
130130

131-
#: cms_toolbars.py:154
132-
#, python-brace-format
133-
msgid "Version #{number} ({state})"
134-
msgstr ""
135-
136-
#: cms_toolbars.py:168
131+
#: cms_toolbars.py:166
137132
msgid "Manage Versions"
138133
msgstr ""
139134

140-
#: cms_toolbars.py:170
135+
#: cms_toolbars.py:168
141136
#, python-brace-format
142-
msgid "Compare to {state} source"
137+
msgid "Compare to {source}"
143138
msgstr ""
144139

145-
#: cms_toolbars.py:211
140+
#: cms_toolbars.py:209
146141
msgid "View Published"
147142
msgstr ""
148143

149-
#: cms_toolbars.py:254
144+
#: cms_toolbars.py:252
150145
msgid "Language"
151146
msgstr ""
152147

153-
#: cms_toolbars.py:301
148+
#: cms_toolbars.py:299
154149
msgid "Add Translation"
155150
msgstr ""
156151

157-
#: cms_toolbars.py:314
152+
#: cms_toolbars.py:312
158153
msgid "Copy all plugins"
159154
msgstr ""
160155

161-
#: cms_toolbars.py:316
156+
#: cms_toolbars.py:314
162157
#, python-format
163158
msgid "from %s"
164159
msgstr ""
165160

166-
#: cms_toolbars.py:317
161+
#: cms_toolbars.py:315
167162
#, python-format
168163
msgid "Are you sure you want to copy all plugins from %s?"
169164
msgstr ""
170165

171-
#: cms_toolbars.py:332
166+
#: cms_toolbars.py:330
172167
msgid "No other language available"
173168
msgstr ""
174169

@@ -242,23 +237,28 @@ msgstr ""
242237
msgid "Version #{number} ({state} {date})"
243238
msgstr ""
244239

245-
#: models.py:224 models.py:271
240+
#: models.py:107
241+
#, python-brace-format
242+
msgid "Version #{number} ({state})"
243+
msgstr ""
244+
245+
#: models.py:229 models.py:276
246246
msgid "Version is not in draft state"
247247
msgstr ""
248248

249-
#: models.py:331
249+
#: models.py:336
250250
msgid "Version is not in published state"
251251
msgstr ""
252252

253-
#: models.py:378 models.py:389
253+
#: models.py:383 models.py:394
254254
msgid "Version is not a draft"
255255
msgstr ""
256256

257-
#: models.py:384
257+
#: models.py:389
258258
msgid "Version is not in archived or unpublished state"
259259
msgstr ""
260260

261-
#: models.py:395
261+
#: models.py:400
262262
msgid "Version is not in draft or published state"
263263
msgstr ""
264264

‎djangocms_versioning/locale/fr/LC_MESSAGES/django.mo‎

-74 Bytes
Binary file not shown.

‎djangocms_versioning/locale/fr/LC_MESSAGES/django.po‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: PACKAGE VERSION\n"
1313
"Report-Msgid-Bugs-To: \n"
14-
"POT-Creation-Date: 2023-01-22 19:30+0100\n"
14+
"POT-Creation-Date: 2023-01-23 10:56+0100\n"
1515
"PO-Revision-Date: 2023-01-10 15:29+0000\n"
1616
"Last-Translator: François Palmier <[email protected]>, 2023\n"
1717
"Language-Team: French (https://www.transifex.com/divio/teams/58664/fr/)\n"
@@ -132,47 +132,43 @@ msgstr "Éditer"
132132
msgid "Revert"
133133
msgstr "Rétablir"
134134

135-
#: cms_toolbars.py:154
136-
#, python-brace-format
137-
msgid "Version #{number} ({state})"
138-
msgstr "Version #{number} ({state})"
139-
140-
#: cms_toolbars.py:168
135+
#: cms_toolbars.py:166
141136
msgid "Manage Versions"
142137
msgstr "Gérer les versions"
143138

144-
#: cms_toolbars.py:170
145-
#, python-brace-format
146-
msgid "Compare to {state} source"
139+
#: cms_toolbars.py:168
140+
#, fuzzy, python-brace-format
141+
#| msgid "Compare to {state} source"
142+
msgid "Compare to {source}"
147143
msgstr "Comparer avec la source {state}"
148144

149-
#: cms_toolbars.py:211
145+
#: cms_toolbars.py:209
150146
msgid "View Published"
151147
msgstr "Vue publiée"
152148

153-
#: cms_toolbars.py:254
149+
#: cms_toolbars.py:252
154150
msgid "Language"
155151
msgstr "Langue"
156152

157-
#: cms_toolbars.py:301
153+
#: cms_toolbars.py:299
158154
msgid "Add Translation"
159155
msgstr "Ajouter une traduction"
160156

161-
#: cms_toolbars.py:314
157+
#: cms_toolbars.py:312
162158
msgid "Copy all plugins"
163159
msgstr "Copier tous les plugins"
164160

165-
#: cms_toolbars.py:316
161+
#: cms_toolbars.py:314
166162
#, python-format
167163
msgid "from %s"
168164
msgstr "de %s"
169165

170-
#: cms_toolbars.py:317
166+
#: cms_toolbars.py:315
171167
#, python-format
172168
msgid "Are you sure you want to copy all plugins from %s?"
173169
msgstr "Êtes-vous sûr de vouloir copier tous les plugins de %s?"
174170

175-
#: cms_toolbars.py:332
171+
#: cms_toolbars.py:330
176172
msgid "No other language available"
177173
msgstr "Aucune autre langue disponible"
178174

@@ -248,23 +244,28 @@ msgstr "source"
248244
msgid "Version #{number} ({state} {date})"
249245
msgstr "Version #{number} ({state} {date})"
250246

251-
#: models.py:224 models.py:271
247+
#: models.py:107
248+
#, python-brace-format
249+
msgid "Version #{number} ({state})"
250+
msgstr "Version #{number} ({state})"
251+
252+
#: models.py:229 models.py:276
252253
msgid "Version is not in draft state"
253254
msgstr "La version n'est pas à l'état de brouillon"
254255

255-
#: models.py:331
256+
#: models.py:336
256257
msgid "Version is not in published state"
257258
msgstr "La version n'est pas dans l'état publié"
258259

259-
#: models.py:378 models.py:389
260+
#: models.py:383 models.py:394
260261
msgid "Version is not a draft"
261262
msgstr "La version n'est pas un brouillon"
262263

263-
#: models.py:384
264+
#: models.py:389
264265
msgid "Version is not in archived or unpublished state"
265266
msgstr "La version n'est pas archivé ou non publié"
266267

267-
#: models.py:395
268+
#: models.py:400
268269
msgid "Version is not in draft or published state"
269270
msgstr "La version n'est pas en brouillon ou publiée"
270271

‎djangocms_versioning/locale/nl/LC_MESSAGES/django.mo‎

27 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)