From 0a3e3f8034e9ccf4bb92eec8784ba06a11ab8144 Mon Sep 17 00:00:00 2001
From: Niklp09 <89982526+Niklp09@users.noreply.github.com>
Date: Sun, 11 Jun 2023 15:11:54 +0200
Subject: [PATCH] fix translation + remove old files

---
 boards/tools/updatepo.sh         | 25 -------------------------
 modpack.txt => modpack.conf      |  0
 ontime_clocks/tools/updatepo.sh  | 25 -------------------------
 signs/tools/updatepo.sh          | 25 -------------------------
 signs_api/init.lua               |  2 +-
 signs_api/locale/signs_api.de.tr |  2 +-
 signs_api/locale/signs_api.fr.tr |  2 +-
 signs_api/locale/signs_api.ms.tr |  2 +-
 signs_api/locale/template.txt    |  2 +-
 signs_api/tools/updatepo.sh      | 25 -------------------------
 signs_road/tools/updatepo.sh     | 25 -------------------------
 steles/tools/updatepo.sh         | 25 -------------------------
 12 files changed, 5 insertions(+), 155 deletions(-)
 delete mode 100755 boards/tools/updatepo.sh
 rename modpack.txt => modpack.conf (100%)
 delete mode 100755 ontime_clocks/tools/updatepo.sh
 delete mode 100755 signs/tools/updatepo.sh
 delete mode 100755 signs_api/tools/updatepo.sh
 delete mode 100755 signs_road/tools/updatepo.sh
 delete mode 100755 steles/tools/updatepo.sh

diff --git a/boards/tools/updatepo.sh b/boards/tools/updatepo.sh
deleted file mode 100755
index feb2504..0000000
--- a/boards/tools/updatepo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-# To create a new translation:
-#   msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
-
-cd "$(dirname "${BASH_SOURCE[0]}")/..";
-
-# Extract translatable strings.
-xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
-		--keyword=S \
-		--keyword=NS:1,2 \
-		--keyword=N_ \
-		--keyword=F \
-		--add-comments='Translators:' \
-		--add-location=file \
-		-o locale/template.pot \
-		$(find . -name '*.lua')
-
-# Update translations.
-find locale -name '*.po' | while read -r file; do
-	echo $file
-	msgmerge --update $file locale/template.pot;
-done
diff --git a/modpack.txt b/modpack.conf
similarity index 100%
rename from modpack.txt
rename to modpack.conf
diff --git a/ontime_clocks/tools/updatepo.sh b/ontime_clocks/tools/updatepo.sh
deleted file mode 100755
index feb2504..0000000
--- a/ontime_clocks/tools/updatepo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-# To create a new translation:
-#   msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
-
-cd "$(dirname "${BASH_SOURCE[0]}")/..";
-
-# Extract translatable strings.
-xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
-		--keyword=S \
-		--keyword=NS:1,2 \
-		--keyword=N_ \
-		--keyword=F \
-		--add-comments='Translators:' \
-		--add-location=file \
-		-o locale/template.pot \
-		$(find . -name '*.lua')
-
-# Update translations.
-find locale -name '*.po' | while read -r file; do
-	echo $file
-	msgmerge --update $file locale/template.pot;
-done
diff --git a/signs/tools/updatepo.sh b/signs/tools/updatepo.sh
deleted file mode 100755
index feb2504..0000000
--- a/signs/tools/updatepo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-# To create a new translation:
-#   msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
-
-cd "$(dirname "${BASH_SOURCE[0]}")/..";
-
-# Extract translatable strings.
-xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
-		--keyword=S \
-		--keyword=NS:1,2 \
-		--keyword=N_ \
-		--keyword=F \
-		--add-comments='Translators:' \
-		--add-location=file \
-		-o locale/template.pot \
-		$(find . -name '*.lua')
-
-# Update translations.
-find locale -name '*.po' | while read -r file; do
-	echo $file
-	msgmerge --update $file locale/template.pot;
-done
diff --git a/signs_api/init.lua b/signs_api/init.lua
index e1ebee3..cdef1fe 100644
--- a/signs_api/init.lua
+++ b/signs_api/init.lua
@@ -54,7 +54,7 @@ function signs_api.set_formspec(pos)
 		else
 			local extralabel = ""
 			if maxlines then
-				extralabel = S(" (first %s lines only)"):format(maxlines)
+				extralabel = S(" (first @1 lines only)", maxlines)
 			end
 
 			fs = "textarea[0.5,0.7;5.5,2;display_text;"..S("Text")..""..
diff --git a/signs_api/locale/signs_api.de.tr b/signs_api/locale/signs_api.de.tr
index b83fc77..12a389f 100644
--- a/signs_api/locale/signs_api.de.tr
+++ b/signs_api/locale/signs_api.de.tr
@@ -1,5 +1,5 @@
 # textdomain: signs_api
 Text=Text
- (first %s lines only)= (nur die ersten %s-Zeilen)
+ (first @1 lines only)= (nur die ersten @1 Zeilen)
 Font=Schriftart
 Write=Schreiben
diff --git a/signs_api/locale/signs_api.fr.tr b/signs_api/locale/signs_api.fr.tr
index eb55e5d..e47ecc9 100644
--- a/signs_api/locale/signs_api.fr.tr
+++ b/signs_api/locale/signs_api.fr.tr
@@ -1,5 +1,5 @@
 # textdomain: signs_api
 Text=Texte
- (first %s lines only)= (uniquement les %s premières lignes)
+ (first @1 lines only)= (uniquement les @1 premières lignes)
 Font=
 Write=Écrire
diff --git a/signs_api/locale/signs_api.ms.tr b/signs_api/locale/signs_api.ms.tr
index bed4a75..76f95f1 100644
--- a/signs_api/locale/signs_api.ms.tr
+++ b/signs_api/locale/signs_api.ms.tr
@@ -1,5 +1,5 @@
 # textdomain: signs_api
 Text=Teks
- (first %s lines only)= (%s baris pertama sahaja)
+ (first @1 lines only)= (@1 baris pertama sahaja)
 Font=
 Write=Tulis
diff --git a/signs_api/locale/template.txt b/signs_api/locale/template.txt
index 7663323..a3993b2 100644
--- a/signs_api/locale/template.txt
+++ b/signs_api/locale/template.txt
@@ -1,5 +1,5 @@
 # textdomain: signs_api
 Text=
- (first %s lines only)=
+ (first @1 lines only)=
 Font=
 Write=
diff --git a/signs_api/tools/updatepo.sh b/signs_api/tools/updatepo.sh
deleted file mode 100755
index feb2504..0000000
--- a/signs_api/tools/updatepo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-# To create a new translation:
-#   msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
-
-cd "$(dirname "${BASH_SOURCE[0]}")/..";
-
-# Extract translatable strings.
-xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
-		--keyword=S \
-		--keyword=NS:1,2 \
-		--keyword=N_ \
-		--keyword=F \
-		--add-comments='Translators:' \
-		--add-location=file \
-		-o locale/template.pot \
-		$(find . -name '*.lua')
-
-# Update translations.
-find locale -name '*.po' | while read -r file; do
-	echo $file
-	msgmerge --update $file locale/template.pot;
-done
diff --git a/signs_road/tools/updatepo.sh b/signs_road/tools/updatepo.sh
deleted file mode 100755
index feb2504..0000000
--- a/signs_road/tools/updatepo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-# To create a new translation:
-#   msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
-
-cd "$(dirname "${BASH_SOURCE[0]}")/..";
-
-# Extract translatable strings.
-xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
-		--keyword=S \
-		--keyword=NS:1,2 \
-		--keyword=N_ \
-		--keyword=F \
-		--add-comments='Translators:' \
-		--add-location=file \
-		-o locale/template.pot \
-		$(find . -name '*.lua')
-
-# Update translations.
-find locale -name '*.po' | while read -r file; do
-	echo $file
-	msgmerge --update $file locale/template.pot;
-done
diff --git a/steles/tools/updatepo.sh b/steles/tools/updatepo.sh
deleted file mode 100755
index feb2504..0000000
--- a/steles/tools/updatepo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-# To create a new translation:
-#   msginit --locale=ll_CC -o locale/ll_CC.po -i locale/template.pot
-
-cd "$(dirname "${BASH_SOURCE[0]}")/..";
-
-# Extract translatable strings.
-xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
-		--keyword=S \
-		--keyword=NS:1,2 \
-		--keyword=N_ \
-		--keyword=F \
-		--add-comments='Translators:' \
-		--add-location=file \
-		-o locale/template.pot \
-		$(find . -name '*.lua')
-
-# Update translations.
-find locale -name '*.po' | while read -r file; do
-	echo $file
-	msgmerge --update $file locale/template.pot;
-done