Merge pull request #455 from PHIDIAS0303/patch-1

Localization

exp_scenario/module/commands/artillery.lua

@@ -39,10 +39,10 @@ end
 commands.artillery = Commands.new("artillery", { "exp-commands_artillery.description" })
     :register(function(player)
         if SelectArea:stop(player) then
-            return Commands.status.success{ "exp-commands_artillery.exit" }
+            return Commands.status.success{ "exp_util.selection_exit", { "exp-commands_artillery.selection-name" } }
         end
         SelectArea:start(player)
-        return Commands.status.success{ "exp-commands_artillery.enter" }
+        return Commands.status.success{ "exp_util.selection_enter", { "exp-commands_artillery.selection-name" } }
     end) --[[@as any]]
 
 --- when an area is selected to add protection to the area

exp_scenario/module/commands/lawnmower.lua

@@ -17,11 +17,11 @@ local commands = {}
 commands.lawnmower = Commands.new("lawnmower", { "exp-commands_lawnmower.description" })
     :register(function(player)
         if SelectArea:stop(player) then
-            return Commands.status.success{ "exp-commands_lawnmower.exit" }
+            return Commands.status.success{ "exp_util.selection_exit", { "exp-commands_lawnmower.selection-name" } }
         end
 
         SelectArea:start(player)
-        return Commands.status.success{ "exp-commands_lawnmower.enter" }
+        return Commands.status.success{ "exp_util.selection_enter", { "exp-commands_lawnmower.selection-name" } }
     end) --[[@as any]]
 
 --- When an area is selected to be handled

exp_scenario/module/commands/repair.lua

@@ -16,10 +16,10 @@ local commands = {}
 commands.repair = Commands.new("repair", { "exp-commands_repair.description" })
     :register(function(player)
         if SelectArea:stop(player) then
-            return Commands.status.success{ "exp-commands_repair.exit" }
+            return Commands.status.success{ "exp_util.selection_exit", { "exp-commands_repair.selection-name" } }
         end
         SelectArea:start(player)
-        return Commands.status.success{ "exp-commands_repair.enter" }
+        return Commands.status.success{ "exp_util.selection_enter", { "exp-commands_repair.selection-name" } }
     end)
 
 --- When an area is selected to be converted to water

exp_scenario/module/commands/surface.lua

@@ -64,11 +64,10 @@ commands.clear_blueprints_surface = Commands.new("clear-blueprints-surface", { "
 commands.clear_blueprints = Commands.new("clear-blueprints", { "exp-commands_surface.description-blueprints" })
     :register(function(player)
         if SelectArea:stop(player) then
-            return Commands.status.success{ "exp-commands_surface.exit" }
+            return Commands.status.success{ "exp_util.selection_exit", { "exp-commands_surface.selection-name" } }
         end
-
         SelectArea:start(player)
-        return Commands.status.success{ "exp-commands_surface.enter" }
+        return Commands.status.success{ "exp_util.selection_enter", { "exp-commands_surface.selection-name" } }
     end) --[[@as any]]
 
 --- When an area is selected

exp_scenario/module/commands/waterfill.lua

@@ -25,7 +25,7 @@ local commands = {}
 commands.waterfill = Commands.new("waterfill", { "exp-commands_waterfill.description" })
     :register(function(player)
         if SelectArea:stop(player) then
-            return Commands.status.success{ "exp-commands_waterfill.exit" }
+            return Commands.status.success{ "exp_util.selection_exit", { "exp-commands_lawnmower.selection-name" } }
         end
         local item_count_cliff = player.get_item_count("cliff-explosives")
         local item_count_craft = math.min(math.floor(player.get_item_count("explosives") / 10), player.get_item_count("barrel"), player.get_item_count("grenade"))
@@ -34,7 +34,7 @@ commands.waterfill = Commands.new("waterfill", { "exp-commands_waterfill.descrip
             return Commands.status.error{ "exp-commands_waterfill.requires-explosives" }
         else
             SelectArea:start(player)
-            return Commands.status.success{ "exp-commands_waterfill.enter" }
+            return Commands.status.success{ "exp_util.selection_enter", { "exp-commands_lawnmower.selection-name" } }
         end
     end) --[[@as any]]
 

exp_scenario/module/gui/readme.lua

@@ -8,6 +8,7 @@ local Roles = require("modules/exp_roles")
 local Commands = require("modules/exp_commands")
 local PlayerData = require("modules.exp_legacy.expcore.player_data")
 local External = require("modules.exp_legacy.expcore.external")
+local config_server_detail = require("modules.exp_legacy.config.server_detail") --- @dep config.server_detail
 
 local format_number = require("util").format_number
 local format_time = ExpUtil.format_time_factory_locale{ format = "long", days = true, hours = true, minutes = true }
@@ -182,7 +183,7 @@ end
 --- Welcome tab
 define_tab(
     { "exp-gui_readme.welcome-tab" },
-    { "exp-gui_readme.welcome-tooltip" },
+    { "exp-gui_readme.welcome-tooltip", config_server_detail["community_name"] },
     Gui.define("readme/welcome")
     :draw(function(_, parent)
         local player = Gui.get_player(parent)
@@ -223,8 +224,9 @@ define_tab(
             frame_width,
             {
                 "exp-gui_readme.welcome-general",
-                server_details.reset_time,
+                config_server_detail["community_name"],
                 format_time(game.tick),
+                server_details.reset_time,
             }
         )
 

exp_scenario/module/locale/en.cfg

@@ -11,10 +11,9 @@ arg-message=The message to send.
 format=[AC] __1__: __2__
 
 [exp-commands_artillery]
+selection-name=Artillery
 description=Automaticly select enemy target with artillery.
 invalid-area=The selected area is not valid.
-enter=Entered artillery selection mode.
-exit=Existed artillery selection mode.
 
 [exp-commands_bot-queue]
 description=Get / Set the construction bot queue limits.
@@ -101,10 +100,9 @@ already-dead=You are already dead.
 lower-role=You must have a higher role than the target.
 
 [exp-commands_lawnmower]
+selection-name=lawnmower
 description=Clean up biter corpse, decoratives and nuclear hole.
 arg-range=Range to clean up.
-enter=Entered selection mode, select the area to fill with water.
-exit=Exited selection mode.
 complete=__1__ tiles were handled.
 
 [exp-commands_locate]
@@ -157,9 +155,8 @@ fluid-out=This will result in: __1__ [fluid=__2__] per second.
 machine-count=And you will need __1__ machines (with the same speed as this one) for this.
 
 [exp-commands_repair]
+selection-name=Repair
 description=Repairs entities on your force around you.
-enter=Entered selection mode, select the area.
-exit=Exited selection mode.
 # Intentional space left on the two lines below so they can be joined together.
 response-revive=__1__ entities were revived. 
 response-heal=__1__ entities were healed. 
@@ -217,14 +214,13 @@ arg-player=Player to start following.
 follow-self=You can not follow yourself.
 
 [exp-commands_surface]
+selection-name=Surface
 description-items=Clear all items on the ground.
 description-blueprints=Clear all blueprints.
 description-blueprints-surface=Clear all blueprints on the current surface.
 arg-surface=Surface to clear on, default all.
 items=__1__ cleared all items on the ground of __2__.
 blueprints=__1__ cleared all blueprints on __2__.
-enter=Entered selection mode, select the area.
-exit=Exited selection mode.
 complete=__1__ blueprint ghost were removed.
 
 [exp-commands_trains]
@@ -250,10 +246,9 @@ title=VLayer Information:
 result=__1__: __2__
 
 [exp-commands_waterfill]
+selection-name=waterfill
 description=Replace tiles with shallow water.
 requires-explosives=__ITEM__cliff-explosives__ are required to create water.
-enter=Entered waterfill selection mode, select the area to fill with water.
-exit=Exited waterfill selection mode.
 nauvis-only=Can only waterfill on Nauvis, this may change in the future.
 area-too-large=Selected area is too large, must be less than __1__ tiles, selected __2__.
 too-few-explosives=Requires __1__ __ITEM__cliff-explosives__ or its ingredients, you have __2__.
@@ -333,9 +328,9 @@ caption-waterfill=Waterfill
 [exp-gui_readme]
 main-tooltip=Information
 welcome-tab=Welcome
-welcome-tooltip=Welcome to Explosive Gaming
+welcome-tooltip=Welcome to __1__
 welcome-title=Welcome to __1__
-welcome-general=Welcome to Explosive Gaming; we host many Factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
+welcome-general=Welcome to __1__; we host many Factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __3__
 welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop items on the ground. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
 welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”). If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
 rules-tab=Rules

exp_scenario/module/locale/zh-CN.cfg

@@ -11,10 +11,9 @@ arg-message=對話。
 format=[AC] __1__: __2__
 
 [exp-commands_artillery]
+selection-name=火炮
 description=火炮遙控
 invalid-area=所選地區無效
-enter=現在進入火炮區域選擇
-exit=已進入火炮區域選擇
 
 [exp-commands_bot-queue]
 description=取得或更改建設隊列數量。
@@ -101,8 +100,10 @@ already-dead=你已經死了。
 lower-role=用戶組比你現有的更高
 
 [exp-commands_lawnmower]
+selection-name=割草機
 description=清理屍體、裝飾和核洞
 arg-range=半徑
+complete=__1__ 格已完成。
 
 [exp-commands_locate]
 description=在地圖上查找用戶
@@ -154,6 +155,7 @@ fluid-out=結果: __1__ [fluid=__2__] 每秒。
 machines=你需要 __1__ 部同樣的機器。
 
 [exp-commands_repair]
+selection-name=維修
 description=維修周邊的建築
 arg-range=半徑
 # Intentional space left on the two lines below so they can be joined together。
@@ -213,14 +215,13 @@ arg-player=用戶
 follow-self=你不能追蹤自己
 
 [exp-commands_surface]
+selection-name=位面
 description-items=清除地面上的物品
 description-blueprints=清除藍圖
 description-blueprints-surface=清除藍圖
 arg-surface=位面
 items=__1__ 清除了所有在 __2__ 中掉地上的東西。
 blueprints=__1__ 清除了所有在 __2__ 中在地上的藍圖。
-enter=現在進入區域選擇
-exit=已進入區域選擇
 area-too-large=區域太大了，需少過 __1__ 格，你選了 __2__ 格。
 complete=__1__ 個地上的藍圖已被清除。
 
@@ -247,10 +248,9 @@ title=vlayer 資訊:
 result=__1__: __2__
 
 [exp-commands_waterfill]
+selection-name=挖水
 description=把地換為淺水。
 requires-explosives=沒有足夠的 __ITEM__cliff-explosives__ 。
-enter=現在進入挖水區域選擇
-exit=已進入挖水區域選擇
 nauvis-only=只可在地星上填水，之後可能會再改變。
 area-too-large=區域太大了，需少過 __1__ 格，你選了 __2__ 格。
 too-few-explosives=需要 __1__ 個 __ITEM__cliff-explosives__ 或其材料，你現在有 __2__ 個。
@@ -320,8 +320,8 @@ tooltip-waterfill=把地換為水。
 [exp-gui_readme]
 main-tooltip=資訊
 welcome-tab=歡迎
-welcome-tooltip=歡迎來到 Explosive Gaming
-welcome-general=歡迎來到 Explosive Gaming; 你在這裏的時候要遵守規則。 你可以在左上方的介面找到更多資訊。 地圖時間 __2__。\n下次地圖重設: __1__
+welcome-tooltip=歡迎來到 __1__
+welcome-general=歡迎來到 __1__; 你在這裏的時候要遵守規則。 你可以在左上方的介面找到更多資訊。 地圖時間 __2__。\n下次地圖重設: __3__
 welcome-roles=我們有自訂的身份組來保護其他用戶。 所以你有機會不能使用拆除規劃器或掉東西。 身份組給予你各種權限\n你有以下身份組: __1__
 welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) - 你也可以在選項中修改按鍵。\n你目前設定為 「__CONTROL__toggle-console__」
 rules-tab=規則
@@ -491,7 +491,7 @@ reply-online=現在有 __1__ 人上線。
 reply-players=本地圖現在有 __1__ 人曾上線。
 reply-dev=Cooldude2606 只是本場境的開發者
 reply-softmod=這裹用了自設情境。
-reply-clusterio=Clusterio is a factorio server hosting platform allowing internet enabled mods. 
+reply-clusterio=Clusterio is a factorio server hosting platform allowing internet enabled mods.
 reply-blame=責怪 __1__ 吧。
 reply-afk=看看 __1__, 他已掛機 __2__ 。
 reply-evolution=現在敵人進化度為 __1__ 。

exp_scenario/module/locale/zh-TW.cfg

@@ -11,10 +11,9 @@ arg-message=對話。
 format=[AC] __1__: __2__
 
 [exp-commands_artillery]
+selection-name=火炮
 description=火炮遙控
 invalid-area=所選地區無效
-enter=現在進入火炮區域選擇
-exit=已進入火炮區域選擇
 
 [exp-commands_bot-queue]
 description=取得或更改建設隊列數量。
@@ -101,8 +100,10 @@ already-dead=你已經死了。
 lower-role=用戶組比你現有的更高
 
 [exp-commands_lawnmower]
+selection-name=割草機
 description=清理屍體、裝飾和核洞
 arg-range=半徑
+complete=__1__ 格已完成。
 
 [exp-commands_locate]
 description=在地圖上查找用戶
@@ -154,6 +155,7 @@ fluid-out=結果: __1__ [fluid=__2__] 每秒。
 machines=你需要 __1__ 部同樣的機器。
 
 [exp-commands_repair]
+selection-name=維修
 description=維修周邊的建築
 arg-range=半徑
 # Intentional space left on the two lines below so they can be joined together。
@@ -213,14 +215,13 @@ arg-player=用戶
 follow-self=你不能追蹤自己
 
 [exp-commands_surface]
+selection-name=位面
 description-items=清除地面上的物品
 description-blueprints=清除藍圖
 description-blueprints-surface=清除藍圖
 arg-surface=位面
 items=__1__ 清除了所有在 __2__ 中掉地上的東西。
 blueprints=__1__ 清除了所有在 __2__ 中在地上的藍圖。
-enter=現在進入區域選擇
-exit=已進入區域選擇
 area-too-large=區域太大了，需少過 __1__ 格，你選了 __2__ 格。
 complete=__1__ 個地上的藍圖已被清除。
 
@@ -247,10 +248,9 @@ title=vlayer 資訊:
 result=__1__: __2__
 
 [exp-commands_waterfill]
+selection-name=挖水
 description=把地換為淺水。
 requires-explosives=沒有足夠的 __ITEM__cliff-explosives__ 。
-enter=現在進入挖水區域選擇
-exit=已進入挖水區域選擇
 nauvis-only=只可在地星上填水，之後可能會再改變。
 area-too-large=區域太大了，需少過 __1__ 格，你選了 __2__ 格。
 too-few-explosives=需要 __1__ 個 __ITEM__cliff-explosives__ 或其材料，你現在有 __2__ 個。
@@ -320,8 +320,8 @@ tooltip-waterfill=把地換為水。
 [exp-gui_readme]
 main-tooltip=資訊
 welcome-tab=歡迎
-welcome-tooltip=歡迎來到 Explosive Gaming
-welcome-general=歡迎來到 Explosive Gaming; 你在這裏的時候要遵守規則。 你可以在左上方的介面找到更多資訊。 地圖時間 __2__。\n下次地圖重設: __1__
+welcome-tooltip=歡迎來到 __1__
+welcome-general=歡迎來到 __1__; 你在這裏的時候要遵守規則。 你可以在左上方的介面找到更多資訊。 地圖時間 __2__。\n下次地圖重設: __3__
 welcome-roles=我們有自訂的身份組來保護其他用戶。 所以你有機會不能使用拆除規劃器或掉東西。 身份組給予你各種權限\n你有以下身份組: __1__
 welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) - 你也可以在選項中修改按鍵。\n你目前設定為 「__CONTROL__toggle-console__」
 rules-tab=規則
@@ -491,7 +491,7 @@ reply-online=現在有 __1__ 人上線。
 reply-players=本地圖現在有 __1__ 人曾上線。
 reply-dev=Cooldude2606 只是本場境的開發者
 reply-softmod=這裹用了自設情境。
-reply-clusterio=Clusterio is a factorio server hosting platform allowing internet enabled mods. 
+reply-clusterio=Clusterio is a factorio server hosting platform allowing internet enabled mods.
 reply-blame=責怪 __1__ 吧。
 reply-afk=看看 __1__, 他已掛機 __2__ 。
 reply-evolution=現在敵人進化度為 __1__ 。