From 9b5577c24eeb2a13cb49c47e0317f55d464c70dc Mon Sep 17 00:00:00 2001 From: BrunoMine Date: Sat, 15 Jul 2017 22:43:57 -0300 Subject: [PATCH] Add support for xgettext tools --- intltest/init.lua | 8 ++++---- intltest/locale/de.po | 8 ++++++-- intltest/locale/es.po | 10 ++++++++-- intltest/locale/pt.po | 8 ++++++-- intltest/locale/template.pot | 6 +++++- intltest/xgettext.sh | 28 ++++++++++++++++++++++++++++ tools/xgettext.bat | 1 + tools/xgettext.sh | 1 + 8 files changed, 59 insertions(+), 11 deletions(-) create mode 100755 intltest/xgettext.sh diff --git a/intltest/init.lua b/intltest/init.lua index 89735c6..c54a703 100644 --- a/intltest/init.lua +++ b/intltest/init.lua @@ -27,7 +27,7 @@ minetest.register_craftitem("intltest:test", { end, }) -minetest.log("action", "(nil)"..SS(nil, "Test: @1 @2", SS(nil, "Blue"), SS(nil, "Car"))) -minetest.log("action", "(es) "..SS("es", "Test: @1 @2", SS("es", "Blue"), SS("es", "Car"))) -minetest.log("action", "(pt) "..SS("pt", "Test: @1 @2", SS("pt", "Blue"), SS("pt", "Car"))) -minetest.log("action", "(de) "..SS("de", "Test: @1 @2", SS("de", "Blue"), SS("de", "Car"))) +minetest.log("action", "(nil)"..SS(nil, "Test: @1 @2", SS(nil, "Green"), SS(nil, "Car"))) +minetest.log("action", "(es) "..SS("es", "Test: @1 @2", SS("es", "Green"), SS("es", "Car"))) +minetest.log("action", "(pt) "..SS("pt", "Test: @1 @2", SS("pt", "Green"), SS("pt", "Car"))) +minetest.log("action", "(de) "..SS("de", "Test: @1 @2", SS("de", "Green"), SS("de", "Car"))) diff --git a/intltest/locale/de.po b/intltest/locale/de.po index ec772f1..ac6b036 100644 --- a/intltest/locale/de.po +++ b/intltest/locale/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: I18N Test Mod 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-25 20:40-0300\n" -"PO-Revision-Date: 2017-07-13 13:36-0300\n" +"POT-Creation-Date: 2017-07-15 22:37-0300\n" +"PO-Revision-Date: 2017-07-15 22:38-0300\n" "Last-Translator: Diego Martnez \n" "Language-Team: Spanish\n" "Language: es\n" @@ -43,3 +43,7 @@ msgid "Item has been used @1 time." msgid_plural "Item has been used @1 times." msgstr[0] "" msgstr[1] "" + +#: init.lua +msgid "Green" +msgstr "Grün" diff --git a/intltest/locale/es.po b/intltest/locale/es.po index cd51b8f..4ae6ae0 100644 --- a/intltest/locale/es.po +++ b/intltest/locale/es.po @@ -2,13 +2,14 @@ # Copyright (C) 2013-2017 Diego Martínez # This file is distributed under the same license as the intllib mod. # Diego Martínez , 2013-2017. +# Diego Martnez , 2017. # msgid "" msgstr "" "Project-Id-Version: I18N Test Mod 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-25 20:40-0300\n" -"PO-Revision-Date: 2017-01-23 17:36-0300\n" +"POT-Creation-Date: 2017-07-15 22:37-0300\n" +"PO-Revision-Date: 2017-07-15 22:38-0300\n" "Last-Translator: Diego Martnez \n" "Language-Team: Spanish\n" "Language: es\n" @@ -16,6 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.7\n" #: init.lua msgid "Hello, world!" @@ -41,3 +43,7 @@ msgid "Item has been used @1 time." msgid_plural "Item has been used @1 times." msgstr[0] "El objeto ha sido usado @1 vez." msgstr[1] "El objeto ha sido usado @1 veces." + +#: init.lua +msgid "Green" +msgstr "Verde" diff --git a/intltest/locale/pt.po b/intltest/locale/pt.po index 6f6b323..4671d83 100644 --- a/intltest/locale/pt.po +++ b/intltest/locale/pt.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: I18N Test Mod 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-25 20:40-0300\n" -"PO-Revision-Date: 2017-07-13 13:35-0300\n" +"POT-Creation-Date: 2017-07-15 22:37-0300\n" +"PO-Revision-Date: 2017-07-15 22:38-0300\n" "Last-Translator: Diego Martnez \n" "Language-Team: Spanish\n" "Language: es\n" @@ -43,3 +43,7 @@ msgid "Item has been used @1 time." msgid_plural "Item has been used @1 times." msgstr[0] "Esse objeto foi usado @1 vez." msgstr[1] "Esse objeto foi usado @2 vezes." + +#: init.lua +msgid "Green" +msgstr "Verde" diff --git a/intltest/locale/template.pot b/intltest/locale/template.pot index 2090d61..bc63c9a 100644 --- a/intltest/locale/template.pot +++ b/intltest/locale/template.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-25 20:40-0300\n" +"POT-Creation-Date: 2017-07-15 22:37-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,3 +42,7 @@ msgid "Item has been used @1 time." msgid_plural "Item has been used @1 times." msgstr[0] "" msgstr[1] "" + +#: init.lua +msgid "Green" +msgstr "" diff --git a/intltest/xgettext.sh b/intltest/xgettext.sh new file mode 100755 index 0000000..b142f8c --- /dev/null +++ b/intltest/xgettext.sh @@ -0,0 +1,28 @@ +#! /bin/bash + +me=$(basename "${BASH_SOURCE[0]}"); + +if [[ $# -lt 1 ]]; then + echo "Usage: $me FILE..." >&2; + exit 1; +fi + +mkdir -p locale; +echo "Generating template..." >&2; +xgettext --from-code=UTF-8 \ + --keyword=S \ + --keyword=SS:2 \ + --keyword=NS:1,2 \ + --keyword=N_ \ + --add-comments='Translators:' \ + --add-location=file \ + -o locale/template.pot \ + "$@" \ + || exit; + +find locale -name '*.po' -type f | while read -r file; do + echo "Updating $file..." >&2; + msgmerge --update "$file" locale/template.pot; +done + +echo "DONE!" >&2; diff --git a/tools/xgettext.bat b/tools/xgettext.bat index 18403db..cec760c 100644 --- a/tools/xgettext.bat +++ b/tools/xgettext.bat @@ -19,6 +19,7 @@ md locale > nul 2>&1 echo Generating template... 1>&2 echo %xgettext% --from-code=UTF-8 -kS -kNS:1,2 -k_ -o locale/template.pot %* %xgettext% --from-code=UTF-8 -kS -kNS:1,2 -k_ -o locale/template.pot %* +%xgettext% --from-code=UTF-8 -kS -kSS:2 -k_ -o locale/template.pot %* if %ERRORLEVEL% neq 0 goto done cd locale diff --git a/tools/xgettext.sh b/tools/xgettext.sh index 1504f42..b142f8c 100755 --- a/tools/xgettext.sh +++ b/tools/xgettext.sh @@ -11,6 +11,7 @@ mkdir -p locale; echo "Generating template..." >&2; xgettext --from-code=UTF-8 \ --keyword=S \ + --keyword=SS:2 \ --keyword=NS:1,2 \ --keyword=N_ \ --add-comments='Translators:' \