From fb5059ae987f8cb3c1b11910470b61e2d5ae82d3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 27 May 2022 13:59:57 +0900 Subject: [PATCH 1/6] Fix text in button for registering a project The option in the drop down menu correctly says "Register Project". However, in the form for registering a new project, the button that executes the action was saying "Project Register". --- promgen/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/promgen/views.py b/promgen/views.py index f7d6f510e..1cc6d5900 100644 --- a/promgen/views.py +++ b/promgen/views.py @@ -692,7 +692,7 @@ class URLList(LoginRequiredMixin, ListView): class ProjectRegister(LoginRequiredMixin, CreateView): - button_label = _("Project Register") + button_label = _("Register Project") model = models.Project fields = ["name", "description", "owner", "shard"] From e4ae8123d1dae5712fcdda78433b54dc1ca1642b Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 27 May 2022 14:12:27 +0900 Subject: [PATCH 2/6] Make the new farm button consistent with the others The text in the button for registering a farm said "New Farm". However, that was not consistent with the "Register " pattern used in the other buttons, so we have changed it. --- promgen/locale/ja/LC_MESSAGES/django.po | 4 ++-- promgen/templates/promgen/project_detail_hosts.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/promgen/locale/ja/LC_MESSAGES/django.po b/promgen/locale/ja/LC_MESSAGES/django.po index 4c255dcb1..cc74335ab 100644 --- a/promgen/locale/ja/LC_MESSAGES/django.po +++ b/promgen/locale/ja/LC_MESSAGES/django.po @@ -105,8 +105,8 @@ msgid "Sync Farm" msgstr "Farmを同期" #: templates/promgen/project_detail_hosts.html:58 -msgid "New Farm" -msgstr "New Farm" +msgid "Register Farm" +msgstr "Register Farm" #: templates/promgen/project_detail_hosts.html:60 msgid "Link Farm" diff --git a/promgen/templates/promgen/project_detail_hosts.html b/promgen/templates/promgen/project_detail_hosts.html index e1d3227c3..a694e276f 100644 --- a/promgen/templates/promgen/project_detail_hosts.html +++ b/promgen/templates/promgen/project_detail_hosts.html @@ -81,7 +81,7 @@ {% else %} - {% trans "New Farm" %} + {% trans "Register Farm" %} {% for name, source in sources %} {% if source.remote %} From 9ddb400005ffec651d4dd0eba8456e0a985ce9da Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 27 May 2022 14:23:29 +0900 Subject: [PATCH 3/6] Make the new host button consistent with the others The text in the button for registering new hosts said "Add new host". That had two problems: - Multiple hosts can be added at the same time, so "host" (in singular) was not correct. - The text was not consistent with the "Register " pattern used in the other buttons. --- promgen/locale/ja/LC_MESSAGES/django.po | 4 ++-- promgen/templates/promgen/farm_detail.html | 2 +- promgen/templates/promgen/project_detail_hosts.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/promgen/locale/ja/LC_MESSAGES/django.po b/promgen/locale/ja/LC_MESSAGES/django.po index cc74335ab..6d550dbb8 100644 --- a/promgen/locale/ja/LC_MESSAGES/django.po +++ b/promgen/locale/ja/LC_MESSAGES/django.po @@ -79,8 +79,8 @@ msgid "Delete this host?" msgstr "Hostを削除しますか？" #: templates/promgen/project_detail_hosts.html:36 -msgid "Add new host" -msgstr "Hostを追加" +msgid "Register Hosts" +msgstr "Hostsを登録" #: templates/promgen/project_detail_hosts.html:37 msgid "Edit Farm" diff --git a/promgen/templates/promgen/farm_detail.html b/promgen/templates/promgen/farm_detail.html index 7673289a1..7fb3c9092 100644 --- a/promgen/templates/promgen/farm_detail.html +++ b/promgen/templates/promgen/farm_detail.html @@ -41,7 +41,7 @@

Farm: {{ farm.name }} ({{ farm.source }})

{% if farm.editable %} - Add new host + Register Hosts {% endif %}
{% csrf_token %} diff --git a/promgen/templates/promgen/project_detail_hosts.html b/promgen/templates/promgen/project_detail_hosts.html index a694e276f..b7aa9fe3b 100644 --- a/promgen/templates/promgen/project_detail_hosts.html +++ b/promgen/templates/promgen/project_detail_hosts.html @@ -48,7 +48,7 @@ {% if project.farm %} {% if project.farm.editable %} - {% trans "Add new host" %} + {% trans "Register Hosts" %} {% trans "Edit Farm" %} From 28faa1ed00fb53904352020f77ac6d596cfabe91 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 27 May 2022 14:35:26 +0900 Subject: [PATCH 4/6] Allow translation for the "Register Hosts" button There is a translation available for this button, however the "trans" function was not used to translate the button text. --- promgen/templates/promgen/farm_detail.html | 2 +- promgen/templates/promgen/host_form.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/promgen/templates/promgen/farm_detail.html b/promgen/templates/promgen/farm_detail.html index 7fb3c9092..9a4bc21e0 100644 --- a/promgen/templates/promgen/farm_detail.html +++ b/promgen/templates/promgen/farm_detail.html @@ -41,7 +41,7 @@

Farm: {{ farm.name }} ({{ farm.source }})

{% if farm.editable %} - Register Hosts + {% trans "Register Hosts" %} {% endif %} {% csrf_token %} diff --git a/promgen/templates/promgen/host_form.html b/promgen/templates/promgen/host_form.html index 0193c3e3a..5d54387be 100644 --- a/promgen/templates/promgen/host_form.html +++ b/promgen/templates/promgen/host_form.html @@ -17,7 +17,7 @@

Farm: {{ farm.name }}

{{ form.as_table }}
- + {% endblock %} From 11b7330666ea15741a1e9c6f6aa7b8a377f0d408 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 30 May 2022 17:00:46 +0900 Subject: [PATCH 5/6] Add Japanese translation for Register Farm --- promgen/locale/ja/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/promgen/locale/ja/LC_MESSAGES/django.po b/promgen/locale/ja/LC_MESSAGES/django.po index 6d550dbb8..5802d5757 100644 --- a/promgen/locale/ja/LC_MESSAGES/django.po +++ b/promgen/locale/ja/LC_MESSAGES/django.po @@ -106,7 +106,7 @@ msgstr "Farmを同期" #: templates/promgen/project_detail_hosts.html:58 msgid "Register Farm" -msgstr "Register Farm" +msgstr "Farmを登録" #: templates/promgen/project_detail_hosts.html:60 msgid "Link Farm" From 63227268736fbb241e0b538b25d42cde800e20d1 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 30 May 2022 17:38:40 +0900 Subject: [PATCH 6/6] Add Japanese compiled messages --- promgen/locale/ja/LC_MESSAGES/django.mo | Bin 2749 -> 2762 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/promgen/locale/ja/LC_MESSAGES/django.mo b/promgen/locale/ja/LC_MESSAGES/django.mo index 4741dc65baf317793d9032e86d33c9dfd92f5045..787c2c2de676da886ae0c2f80860848a040f4666 100644 GIT binary patch delta 854 zcmXw%J4hT+6o${NtLrPq*Z7D*SJXfXZ7jD^A*f)XBxr~TDxwlZ*%gAM7!U;u2}u^g zKvJbhXW?ogVj&0;ix2{7M1r6YL<>ogO3?40y&mSwch9+V&+E>ff8@V!4tz7~$T7=< zgRlgSz#=%~>;+hfz2f)};Mf@tcbA1d(>RAJN3egj*uS6~C&fNJCijKfQ37w2d9p9U-x zpa&}8AXI`WsDrcc5nOflH>g4n;4u6NRah%+sqikScrTzD75UC6F*C^_})UeQeRGLmn zn$QZAPQpxas1c}5exy(udFuitBnn0Iy_a$p8bdXzs?`Bk)(Xt((1&OQtw%LiNi$lD zs(neOFUR-NucL1(o{c7FY+zz?IyFC$jCaqb=2MxI=ujln8C&zxr}@j_7iWtf|9;xN NSlzVj7q1G&ygLlVP{{xQ delta 853 zcmXxiKS*0q6vy$C7;CH=Yc=&RHB#Li9Gn!PRw#lH1QGvGDnbI%q6xMbbnsCJ5f`nY znY$IFWJ$Xz?mCErWD*1sbr7Lb-TeMuZZ5g`+;iW1_nvd#JB}Vkce}k>GaIfji((v~ zVFDxg8EbIO#hchf{KL7A4a7&N=g(Yx{>nf7Txt>1%Mzc*x_e__x~jG`Wx z!Z6O`2!6s2%%e6uabDmH;s>llt1QJ4)P|i{g}wL+`%&wUA&=N(rDv9AFw2B0Jwa_y zL}hq~g8{Sus15pAO_jbwRWglAU=DRX?c#OpA>P4G{EI5!9Ao&;#f=_i>V`hl0^_I! zKcY5Bp&nepHq5#>kAA|)&x-tgz)MtuLzJmPCY(vsx*60yTP~i-G0;){LXxsSsErO# zHx`kfUGw)HAKd)6=cUAUPz(P?4oYvpZ!fc}!FErnD7|uf!$9X!PY=4uZq!$$U0B3F zA7!Gf^pe!N=q>)JRJKafv6WjRgJ!y3vfi62;P?i>tevhD`5NstUFTVDtqfGA--Z*3 z*iteRTS$HRT6kL#4Fr>!Y&^74xDUmHb)(E)ZS3719bRw$EDTiT0^v9}zn@=T%$|lf J3(M8hfhQ@fPtgDX