From 0a3613476ceb9175beaab529212c0b5f2d56aec3 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sun, 1 May 2022 22:34:03 +1000
Subject: [PATCH 1/4] Fix empty translation string
---
InvenTree/templates/js/translated/order.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js
index c971a4d694..4aad54a65a 100644
--- a/InvenTree/templates/js/translated/order.js
+++ b/InvenTree/templates/js/translated/order.js
@@ -2413,7 +2413,7 @@ function showAllocationSubTable(index, row, element, options) {
},
{
field: 'buttons',
- title: '{% trans "" %}',
+ title: '',
formatter: function(value, row, index, field) {
var html = `<div class='btn-group float-right' role='group'>`;
From ef530956a8dbb6185e12b3067195e373f3b74b56 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sun, 1 May 2022 22:38:18 +1000
Subject: [PATCH 2/4] Run translation as part of the update process
---
tasks.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tasks.py b/tasks.py
index 34528e2609..0578f69acd 100644
--- a/tasks.py
+++ b/tasks.py
@@ -236,7 +236,7 @@ def translate(c):
manage(c, "compilemessages")
-@task(pre=[install, migrate, translate_stats, static, clean_settings])
+@task(pre=[install, migrate, translate, static, clean_settings])
def update(c):
"""
Update InvenTree installation.
From 8abc96a79afeac9ed0779162e6be3823dab9a7a9 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sun, 1 May 2022 22:42:25 +1000
Subject: [PATCH 3/4] Ignore .mo files
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index 6532442dc7..56d4180482 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,6 @@ maintenance_mode_state.txt
# plugin dev directory
plugins/
+
+# Compiled translation files
+*.mo
From 9e469a949f5d27cff3a7e6a1d991344e0f84aa80 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sun, 1 May 2022 22:43:25 +1000
Subject: [PATCH 4/4] Push from latest master to l10 branch
---
.github/workflows/translations.yml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index 24106c028e..044187e135 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -38,19 +38,11 @@ jobs:
- name: Make Translations
run: |
invoke translate
- - name: stash changes
- run: |
- git stash
- - name: Checkout Translation Branch
- uses: actions/checkout@v2.3.4
- with:
- ref: l10
- name: Commit files
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- git checkout stash -- .
- git reset
+ git checkout -b l10_local
git add "*.po"
git commit -m "updated translation base"
- name: Push changes