Translation fixes and improvements #289

OgelGames · 2022-11-12T14:20:28Z

See also 25b2d0f

Not included in this PR:

Translations for multimeter formspec: https://github.com/mt-mods/technic/blob/master/technic/tools/multimeter.lua
Translations of commands and their chat messages (not sure if this is necessary): https://github.com/mt-mods/technic/blob/master/technic/chatcommands.lua

S-S-X

Looks fine to me.

If you're interested / have some extra time:
One good addition would be adding "Fuel used" (or maybe better "fuel used") to translations.
Could just use some online translation service like google translate, ppl can suggest better translations later.

Actually switching to "fuel remaining" / "fuel left" would be better as it allows meaningful use of non-proportional units but that would require also changing some logic...

At least fuel fired generator could also use that, more/better infotexts been requested for many things anyway.

S-S-X · 2022-11-12T19:27:16Z

Tried some smodin.io online multi translator service which gave these results, I guess that or some other similar thing could be used if you'd like to extend this pr to translation improvements:

English
10% fuel remaining

French
10% de carburant restant

Italian
10% di carburante rimanente

Finnish
10% polttoainetta jäljellä

Polish
Pozostało 10% paliwa

Spanish
10% combustible restante

Chinese Simplified
剩余 10% 燃油

Portuguese
10% de combustível restante

OgelGames · 2022-11-13T02:27:55Z

I think I will make this a translation improvements PR, there are some new strings in #288 that need to be added, and there are also other strings that have not been wrapped by the translator yet.

For example, in the reactor formspec, only the label is translated:

technic/technic/machines/HV/nuclear_reactor.lua

Lines 33 to 52 in 25b2d0f

    
           local function make_reactor_formspec(meta) 
        
           	local f = "size[8,9]".. 
        
           	"label[0,0;"..S("Nuclear Reactor Rod Compartment").."]".. 
        
           	"list[context;src;2,1;3,2;]".. 
        
           	"list[current_player;main;0,5;8,4;]".. 
        
           	"listring[]".. 
        
           	"button[5.5,1.5;2,1;start;Start]".. 
        
           	"checkbox[5.5,2.5;autostart;automatic Start;"..meta:get_string("autostart").."]" 
        
           	if not has_digilines then 
        
           		return f 
        
           	end 
        
           	local digiline_enabled = meta:get_string("enable_digiline") 
        
           	f = f.."checkbox[0.5,2.8;enable_digiline;Enable Digiline;"..digiline_enabled.."]" 
        
           	if digiline_enabled ~= "true" then 
        
           		return f 
        
           	end 
        
           	return f.. 
        
           		"button_exit[4.6,3.69;2,1;save;Save]".. 
        
           		"field[1,4;4,1;channel;Digiline Channel;${channel}]" 
        
           end

also fix some things in init.lua because i can't help myself

wsor4035

looks good

OgelGames · 2022-11-13T05:31:28Z

Oh, renaming the branch closes the PR... 🤦

EDIT: ...and you can't change the source branch... pfft

OgelGames · 2022-11-13T05:39:59Z

Could just use some online translation service like google translate, ppl can suggest better translations later.

Yeah, better to have some translation there, even if it's not perfect.

Actually switching to "fuel remaining" / "fuel left" would be better as it allows meaningful use of non-proportional units but that would require also changing some logic...

That would be better, but it might confuse some players that got used to the current functionality... but I guess the clarification will solve that anyway.

Also the fuel-fired generator already uses the "fuel left" logic, and could make use of the translation too:

technic/technic/machines/register/generator.lua

Line 85 in d58afd8

meta:set_string("infotext", desc.." ("..percent.."%)")

The fuel-fired stuff also should take into account the number of items left, currently the percentage is just for a single item.

https://www.deepl.com/translator

technic/init.lua

also remove duplicate technic_flush_switch_cache command

wsor4035 · 2022-11-14T02:39:15Z

@OgelGames ready for review, but neither todos are checked off?

OgelGames · 2022-11-14T03:40:24Z

@OgelGames ready for review, but neither todos are checked off?

I'm not sure if I'm going to include those in this PR, I don't really want to touch @S-S-X's multimeter code, and I don't know if the commands need to be translated.

OgelGames · 2022-11-14T03:45:18Z

Now that I think of it, I probably should check the translations for the other sub-mods, they might need updating too...

wsor4035

looks good. at this scale, probably best to have a double check on it however

wsor4035 · 2022-11-14T04:01:30Z

Now that I think of it, I probably should check the translations for the other sub-mods, they might need updating too...

as big as this pr is already, probably best for another one?

OgelGames · 2022-11-14T04:21:10Z

as big as this pr is already, probably best for another one?

Yeah, the other translations seem more complete (nothing much has changed since #255), so those can wait for another PR.

github-actions · 2022-11-15T02:35:21Z

Click for detailed source code test coverage report

Test coverage report for Technic CNC 87.36% in 11/14 files:

File                             Hits Missed Coverage
-----------------------------------------------------
programs.lua                   263  0      100.00%
materials/technic_worldgen.lua 32   0      100.00%
materials/init.lua             14   0      100.00%
materials/default.lua          183  0      100.00%
materials/basic_materials.lua  17   0      100.00%
init.lua                       16   0      100.00%
digilines.lua                  55   0      100.00%
cnc.lua                        53   0      100.00%
formspec.lua                   104  7      93.69%
api.lua                        219  43     83.59%
pipeworks.lua                  25   13     65.79%
materials/moreblocks.lua       0    29     0.00%
materials/ethereal.lua         0    37     0.00%
materials/bakedclay.lua        0    13     0.00%

Test coverage report for technic chests 45.56% in 6/6 files:

File          Hits Missed Coverage
----------------------------------
chests.lua    102  18     85.00%
init.lua      34   18     65.38%
register.lua  84   78     51.85%
formspec.lua  76   93     44.97%
inventory.lua 10   100    9.09%
digilines.lua 2    61     3.17%

Test coverage report for technic 63.41% in 97/97 files:

File                                      Hits Missed Coverage
--------------------------------------------------------------
max_lag.lua                               12   0      100.00%
machines/register/init.lua                15   0      100.00%
machines/register/freezer_recipes.lua     13   0      100.00%
machines/other/init.lua                   8    0      100.00%
machines/MV/solar_array.lua               12   0      100.00%
machines/MV/init.lua                      17   0      100.00%
machines/MV/grinder.lua                   17   0      100.00%
machines/MV/generator.lua                 9    0      100.00%
machines/MV/freezer.lua                   17   0      100.00%
machines/MV/extractor.lua                 17   0      100.00%
machines/MV/electric_furnace.lua          17   0      100.00%
machines/MV/compressor.lua                17   0      100.00%
machines/MV/centrifuge.lua                17   0      100.00%
machines/MV/cables.lua                    40   0      100.00%
machines/MV/battery_box.lua               17   0      100.00%
machines/MV/alloy_furnace.lua             19   0      100.00%
machines/LV/solar_array.lua               11   0      100.00%
machines/LV/init.lua                      17   0      100.00%
machines/LV/grinder.lua                   16   0      100.00%
machines/LV/generator.lua                 9    0      100.00%
machines/LV/electric_furnace.lua          15   0      100.00%
machines/LV/compressor.lua                20   0      100.00%
machines/LV/cables.lua                    40   0      100.00%
machines/LV/battery_box.lua               15   0      100.00%
machines/LV/alloy_furnace.lua             17   0      100.00%
machines/HV/solar_array.lua               11   0      100.00%
machines/HV/init.lua                      12   0      100.00%
machines/HV/grinder.lua                   17   0      100.00%
machines/HV/generator.lua                 9    0      100.00%
machines/HV/electric_furnace.lua          17   0      100.00%
machines/HV/compressor.lua                17   0      100.00%
machines/HV/cables.lua                    39   0      100.00%
machines/HV/battery_box.lua               17   0      100.00%
legacy.lua                                33   0      100.00%
items.lua                                 107  0      100.00%
crafts.lua                                133  0      100.00%
machines/LV/led.lua                       73   1      98.65%
config.lua                                50   1      98.04%
machines/register/compressor_recipes.lua  36   1      97.30%
machines/LV/geothermal.lua                75   3      96.15%
machines/register/cables.lua              96   4      96.00%
machines/register/solar_array.lua         46   2      95.83%
machines/network.lua                      403  19     95.50%
machines/LV/solar_panel.lua               42   2      95.45%
init.lua                                  21   1      95.45%
machines/register/alloy_recipes.lua       40   3      93.02%
tools/init.lua                            13   1      92.86%
machines/LV/water_mill.lua                67   6      91.78%
machines/compat/tools.lua                 58   6      90.62%
machines/LV/lamp.lua                      111  13     89.52%
machines/register/grindings.lua           42   5      89.36%
register.lua                              28   4      87.50%
machines/register/grinder_recipes.lua     106  16     86.89%
machines/register/battery_box.lua         239  41     85.36%
tools/flashlight.lua                      64   13     83.12%
util/throttle.lua                         9    2      81.82%
machines/init.lua                         38   9      80.85%
machines/register/machine_base.lua        165  41     80.10%
machines/LV/extractor.lua                 18   5      78.26%
radiation.lua                             271  80     77.21%
machines/power_monitor.lua                59   19     75.64%
machines/register/recipes.lua             62   20     75.61%
machines/register/centrifuge_recipes.lua  21   7      75.00%
machines/switching_station.lua            80   32     71.43%
effects.lua                               5    2      71.43%
machines/overload.lua                     12   5      70.59%
machines/MV/wind_mill.lua                 46   22     67.65%
machines/supply_converter.lua             95   46     67.38%
machines/other/coal_furnace.lua           2    1      66.67%
machines/other/injector.lua               72   39     64.86%
machines/switching_station_globalstep.lua 28   16     63.64%
tools/multimeter.lua                      130  78     62.50%
machines/MV/hydro_turbine.lua             43   26     62.32%
machines/MV/tool_workshop.lua             56   34     62.22%
machines/other/coal_alloy_furnace.lua     80   49     62.02%
machines/register/generator.lua           122  88     58.10%
machines/register/common.lua              63   51     55.26%
tools/cans.lua                            53   48     52.48%
tools/mining_lasers.lua                   36   35     50.70%
machines/other/constructor.lua            67   69     49.26%
machines/LV/music_player.lua              44   46     48.89%
tools/tree_tap.lua                        24   27     47.06%
tools/vacuum.lua                          16   20     44.44%
machines/HV/forcefield.lua                103  155    39.92%
machines/HV/quarry.lua                    131  211    38.30%
machines/HV/nuclear_reactor.lua           119  206    36.62%
helpers.lua                               54   99     35.29%
tools/sonic_screwdriver.lua               16   33     32.65%
machines/compat/api.lua                   16   34     32.00%
tools/chainsaw.lua                        37   80     31.62%
chatcommands.lua                          19   45     29.69%
machines/other/frames.lua                 184  445    29.25%
tools/mining_drill.lua                    65   195    25.00%
machines/other/anchor.lua                 14   74     15.91%
tools/prospector.lua                      14   100    12.28%
machines/compat/digtron.lua               4    41     8.89%
machines/register/extractor_recipes.lua   6    77     7.23%

Raw test runner output for geeks:

CNC:

●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●
31 successes / 0 failures / 0 errors / 0 pending : 0.474329 seconds

Chests:

W:	Configuration: invalid key	exclude_textures
●●●●●
5 successes / 0 failures / 0 errors / 0 pending : 0.03311 seconds

Technic:

●◌◌●●●◌●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●◌●●●●●W:	Deprecated technic.register_power_tool use. Setting max_charge for oldlegacy:powertool
W:	Deprecated technic.register_power_tool use. Setting max_charge for oldminimal:powertool
W:	Deprecated technic.register_power_tool use. Setting max_charge for oldhalfway:powertool
W:	Deprecated technic.register_power_tool use. Ensuring fields for oldlegacy:powertool
W:	Using metadata charge values for oldlegacy:powertool
W:	Updated legacy Technic power tool definition for oldlegacy:powertool
W:	Deprecated technic.register_power_tool use. Ensuring fields for oldminimal:powertool
W:	Using metadata charge values for oldminimal:powertool
W:	Updated legacy Technic power tool definition for oldminimal:powertool
W:	Deprecated technic.register_power_tool use. Ensuring fields for oldhalfway:powertool
W:	Mod oldhalfway seems to be aware of technic.plus but oldhalfway:powertool is still using deprecated registration, skipping meta charge compatibility.
W:	Updated legacy Technic power tool definition for oldhalfway:powertool
●●●●W:	Use of deprecated function technic.set_RE_wear with stack: oldlegacy:powertool
●W:	Use of deprecated function technic.set_RE_wear with stack: oldlegacy:powertool
●●●●●●●W:	Use of deprecated function technic.set_RE_wear with stack: oldminimal:powertool
●W:	Use of deprecated function technic.set_RE_wear with stack: oldminimal:powertool
●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●
222 successes / 0 failures / 0 errors / 4 pending : 9.892219 seconds

Pending → spec/api_spec.lua @ 133
Technic API Machine registration registers my_mod:my_battery
spec/api_spec.lua:133: Battery box registration does not include all fields

Pending → spec/api_spec.lua @ 190
Technic API Machine registration registers my_mod:machine_base
spec/api_spec.lua:190: Base machine registration does not include all fields

Pending → spec/api_spec.lua @ 285
Technic API internals technic.cables TBD, misleading name and should be updated
spec/api_spec.lua:285: TBD technic.cables naming and need, see technic networks data for possible options

Pending → spec/supply_converter_spec.lua @ 78
Supply converter building overloads network
spec/supply_converter_spec.lua:78: overload does not work with supply converter

OgelGames · 2022-11-15T04:29:05Z

I think this should be safe to merge, the "fuel used"/"fuel left" logic changes are best done in another PR, preferably with other improvements to infotexts, such as #154.

fix reactor desc translation

c45e70b

OgelGames added the Bug fix label Nov 12, 2022

S-S-X approved these changes Nov 12, 2022

View reviewed changes

BuckarooBanzay approved these changes Nov 12, 2022

View reviewed changes

OgelGames added the WIP Work in progress label Nov 13, 2022

OgelGames marked this pull request as draft November 13, 2022 02:28

OgelGames changed the title ~~Fix reactor description translation~~ Translation fixes and improvements Nov 13, 2022

OgelGames added 2 commits November 13, 2022 13:44

printed strings don't get translated

79efe33

also fix some things in init.lua because i can't help myself

Merge branch 'master' into desc_fix

80f89bb

wsor4035 approved these changes Nov 13, 2022

View reviewed changes

translate stuff

a02a0e8

OgelGames closed this Nov 13, 2022

OgelGames deleted the desc_fix branch November 13, 2022 05:30

OgelGames restored the desc_fix branch November 13, 2022 05:32

OgelGames reopened this Nov 13, 2022

OgelGames added 2 commits November 13, 2022 22:06

update translation files

de6c3ac

add missing translations using DeepL

3b2d92c

https://www.deepl.com/translator

S-S-X reviewed Nov 13, 2022

View reviewed changes

technic/init.lua Outdated Show resolved Hide resolved

OgelGames added 2 commits November 14, 2022 00:04

get rid of loading message

9015bbc

move chat commands to separate file

1af1e21

also remove duplicate technic_flush_switch_cache command

OgelGames marked this pull request as ready for review November 13, 2022 15:49

OgelGames removed the WIP Work in progress label Nov 13, 2022

wsor4035 approved these changes Nov 14, 2022

View reviewed changes

OgelGames added Translations and removed Bug fix labels Nov 14, 2022

OgelGames mentioned this pull request Nov 14, 2022

Update/cleanup translations and move to MT 5.0.0+ translation system #104

Open

5 tasks

Merge branch 'master' into desc_fix

43e9efa

OgelGames merged commit bd97516 into master Nov 15, 2022

OgelGames deleted the desc_fix branch November 15, 2022 04:30

OgelGames mentioned this pull request Nov 5, 2023

ES locale update #332

Closed

Athozus added this to the 2.0.0 milestone Apr 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Translation fixes and improvements #289

Translation fixes and improvements #289

OgelGames commented Nov 12, 2022 •

edited

Loading

S-S-X left a comment

S-S-X commented Nov 12, 2022

OgelGames commented Nov 13, 2022

wsor4035 left a comment

OgelGames commented Nov 13, 2022 •

edited

Loading

OgelGames commented Nov 13, 2022 •

edited

Loading

wsor4035 commented Nov 14, 2022

OgelGames commented Nov 14, 2022

OgelGames commented Nov 14, 2022

wsor4035 left a comment

wsor4035 commented Nov 14, 2022

OgelGames commented Nov 14, 2022

github-actions bot commented Nov 15, 2022

Test coverage report for Technic CNC 87.36% in 11/14 files:

Test coverage report for technic chests 45.56% in 6/6 files:

Test coverage report for technic 63.41% in 97/97 files:

Raw test runner output for geeks:

OgelGames commented Nov 15, 2022

Translation fixes and improvements #289

Translation fixes and improvements #289

Conversation

OgelGames commented Nov 12, 2022 • edited Loading

S-S-X left a comment

Choose a reason for hiding this comment

S-S-X commented Nov 12, 2022

OgelGames commented Nov 13, 2022

wsor4035 left a comment

Choose a reason for hiding this comment

OgelGames commented Nov 13, 2022 • edited Loading

OgelGames commented Nov 13, 2022 • edited Loading

wsor4035 commented Nov 14, 2022

OgelGames commented Nov 14, 2022

OgelGames commented Nov 14, 2022

wsor4035 left a comment

Choose a reason for hiding this comment

wsor4035 commented Nov 14, 2022

OgelGames commented Nov 14, 2022

github-actions bot commented Nov 15, 2022

Test coverage report for Technic CNC 87.36% in 11/14 files:

Test coverage report for technic chests 45.56% in 6/6 files:

Test coverage report for technic 63.41% in 97/97 files:

Raw test runner output for geeks:

OgelGames commented Nov 15, 2022

OgelGames commented Nov 12, 2022 •

edited

Loading

OgelGames commented Nov 13, 2022 •

edited

Loading

OgelGames commented Nov 13, 2022 •

edited

Loading