From a84e17fa78996e6cc35921020874cfb259ae873b Mon Sep 17 00:00:00 2001 From: ywang Date: Sun, 19 Jul 2020 15:50:34 +0200 Subject: [BREAKING] Use client-side translations instead of intllib; add zh_CN translations * Client-side translations is used instead of intllib. [Breaks MT4 compat] * Existing locale files have been moved to advtrains/locale and named with the format advtrains.[lang].tr * Add zh_CN locale. (requires a font that supports CJK text) --- advtrains_train_industrial/init.lua | 8 +------- advtrains_train_industrial/locale/de.txt | 5 ----- advtrains_train_japan/init.lua | 7 +------ advtrains_train_japan/locale/de.txt | 4 ---- advtrains_train_steam/init.lua | 7 +------ advtrains_train_steam/locale/de.txt | 6 ------ advtrains_train_subway/init.lua | 7 +------ advtrains_train_subway/locale/de.txt | 2 -- 8 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 advtrains_train_industrial/locale/de.txt delete mode 100644 advtrains_train_japan/locale/de.txt delete mode 100755 advtrains_train_steam/locale/de.txt delete mode 100644 advtrains_train_subway/locale/de.txt diff --git a/advtrains_train_industrial/init.lua b/advtrains_train_industrial/init.lua index 4d64615..beec5b3 100644 --- a/advtrains_train_industrial/init.lua +++ b/advtrains_train_industrial/init.lua @@ -1,10 +1,4 @@ --- Boilerplate to support localized strings if intllib mod is installed. -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end -end +local S = attrans advtrains.register_wagon("engine_industrial", { mesh="advtrains_engine_industrial.b3d", diff --git a/advtrains_train_industrial/locale/de.txt b/advtrains_train_industrial/locale/de.txt deleted file mode 100644 index a45ca27..0000000 --- a/advtrains_train_industrial/locale/de.txt +++ /dev/null @@ -1,5 +0,0 @@ -Driver Stand (left) = Führerstand Links -Driver Stand (right) = Führerstand Rechts -Industrial Train Engine = Industrielle Lokomotive -Industrial tank wagon = Tankwaggon -Industrial wood wagon = Holztransportwaggon \ No newline at end of file diff --git a/advtrains_train_japan/init.lua b/advtrains_train_japan/init.lua index c76ce8f..1aa2771 100644 --- a/advtrains_train_japan/init.lua +++ b/advtrains_train_japan/init.lua @@ -1,9 +1,4 @@ -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end -end +local S = attrans advtrains.register_wagon("engine_japan", { mesh="advtrains_engine_japan.b3d", diff --git a/advtrains_train_japan/locale/de.txt b/advtrains_train_japan/locale/de.txt deleted file mode 100644 index 63d7a97..0000000 --- a/advtrains_train_japan/locale/de.txt +++ /dev/null @@ -1,4 +0,0 @@ -Driver Stand = Führerstand -Japanese Train Engine = Japanische Personenzug-Lokomotive -Default Seat = Standardsitzplatz -Japanese Train Wagon = Japanischer Personenzug-Passagierwaggon \ No newline at end of file diff --git a/advtrains_train_steam/init.lua b/advtrains_train_steam/init.lua index 6b5047c..057ad8f 100755 --- a/advtrains_train_steam/init.lua +++ b/advtrains_train_steam/init.lua @@ -1,9 +1,4 @@ -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end -end +local S = attrans -- length of the steam engine loop sound local SND_LOOP_LEN = 5 diff --git a/advtrains_train_steam/locale/de.txt b/advtrains_train_steam/locale/de.txt deleted file mode 100755 index ac06e20..0000000 --- a/advtrains_train_steam/locale/de.txt +++ /dev/null @@ -1,6 +0,0 @@ -Driver Stand (left) = Führerstand Links -Driver Stand (right) = Führerstand Rechts -Steam Engine = Dampflokomotive -Detailed Steam Engine = detaillierte Dampflokomotive -Passenger Wagon = Passagierwaggon -Box wagon = Güterwaggon \ No newline at end of file diff --git a/advtrains_train_subway/init.lua b/advtrains_train_subway/init.lua index 845f15f..c51758d 100644 --- a/advtrains_train_subway/init.lua +++ b/advtrains_train_subway/init.lua @@ -1,9 +1,4 @@ -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s,a,...)a={a,...}return s:gsub("@(%d+)",function(n)return a[tonumber(n)]end)end -end +local S = attrans advtrains.register_wagon("subway_wagon", { mesh="advtrains_subway_wagon.b3d", diff --git a/advtrains_train_subway/locale/de.txt b/advtrains_train_subway/locale/de.txt deleted file mode 100644 index 4aceebd..0000000 --- a/advtrains_train_subway/locale/de.txt +++ /dev/null @@ -1,2 +0,0 @@ -Default Seat (driver stand) = Standardsitzplatz (Führerstand) -Subway Passenger Wagon = U-Bahn-Waggon \ No newline at end of file -- cgit v1.2.3