1
0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-03-17 21:08:08 +02:00

Minor locale cleanup

This commit is contained in:
plague006 2019-03-04 01:51:57 -05:00 committed by Lynn
parent 998fdcf20f
commit e395f0c6d7
4 changed files with 19 additions and 14 deletions

View File

@ -34,7 +34,7 @@ local on_player_settings_get = Token.register(function (data)
local button = player.gui.top[main_button_name]
button.enabled = true
button.tooltip = {'redmew_settings.menu_item_tooltip'}
button.tooltip = {'redmew_settings_gui.menu_item_tooltip'}
end)
local function player_created(event)
@ -47,13 +47,13 @@ local function player_created(event)
type = 'sprite-button',
name = main_button_name,
sprite = 'item/iron-gear-wheel',
tooltip = {'redmew_settings.menu_item_tooltip'}
tooltip = {'redmew_settings_gui.menu_item_tooltip'}
})
-- disable the button if the remote server is used, won't be available until the settings are loaded
if global.config.redmew_settings.use_remote_server then
button.enabled = false
button.tooltip = {'redmew_settings.menu_item_tooltip_loading'}
button.tooltip = {'redmew_settings_gui.menu_item_tooltip_loading'}
end
end
@ -100,7 +100,7 @@ local function draw_main_frame(center, player)
type = 'frame',
name = main_frame_name,
direction = 'vertical',
caption = {'redmew_settings.frame_title'},
caption = {'redmew_settings_gui.frame_title'},
})
local settings_frame_style = settings_frame.style
@ -149,13 +149,13 @@ local function draw_main_frame(center, player)
left_flow.style.horizontal_align = 'left'
left_flow.style.horizontally_stretchable = true
local close_button = left_flow.add({type = 'button', name = main_button_name, caption = {'redmew_settings.button_cancel'}})
local close_button = left_flow.add({type = 'button', name = main_button_name, caption = {'redmew_settings_gui.button_cancel'}})
close_button.style = 'back_button'
local right_flow = bottom_flow.add({type = 'flow'})
right_flow.style.horizontal_align = 'right'
local save_button = right_flow.add({type = 'button', name = save_changes_button_name, caption = {'redmew_settings.button_save_changes'}})
local save_button = right_flow.add({type = 'button', name = save_changes_button_name, caption = {'redmew_settings_gui.button_save_changes'}})
save_button.style = 'confirm_button'
Gui.set_data(save_button, data)
@ -214,7 +214,7 @@ local function save_changes(event)
Settings.set(player_index, name, value)
end
Toast.toast_player(player, 5, {'redmew_settings.save_success_toast_message'})
Toast.toast_player(player, 5, {'redmew_settings_gui.save_success_toast_message'})
if global.config.redmew_settings.use_remote_server then
Server.set_data('player_settings', player.name, Settings.all(player_index));

View File

@ -48,11 +48,16 @@ toast_all=__1__ sent a toast to all players.
toast_player=__1__ sent a toast to __2__.
toast_volume_setting_label=Toast message volume
[redmew_settings]
[redmew_settings_gui]
menu_item_tooltip=Your RedMew settings
menu_item_tooltip_loading=Loading your personal settings...
save_success_toast_message=Your settings have been updated!
frame_title=Redmew Settings
button_cancel=Cancel
button_save_changes=Save changes
[toast]
toast_volume_setting_label=Toast message volume
[player_list]
tooltip=Player list

View File

@ -1,5 +1,6 @@
# This file holds all the locale strings for the utils
<<<<<<< HEAD
[command]
help_text_format=__1__ __2__ __3__
log_entry=__1__(Map time: __2__) [__3__ Command] __4__, used: __5__ __6__
@ -29,9 +30,8 @@ print_admins=__1__(ADMIN) __2__: __3__
[gui_util]
button_tooltip=Shows / hides the Redmew Gui buttons.
[redmew_settings]
[redmew_settings_util]
fraction_invalid_value=fraction setting type requires the input to be a valid number between 0 and 1.
string_invalid_value=string setting type requires the input to be either a valid string or something that can be converted to a string.
boolean_invalid_value=boolean setting type requires the input to be either a boolean, number or string that can be transformed to a boolean.
button_cancel=Cancel
button_save_changes=Save changes

View File

@ -12,7 +12,7 @@ local settings_type = {
input = tonumber(input)
if input == nil then
return false, {'redmew_settings.fraction_invalid_value'}
return false, {'redmew_settings_util.fraction_invalid_value'}
end
if input < 0 then
@ -39,7 +39,7 @@ local settings_type = {
return true, tostring(input)
end
return false, {'redmew_settings.string_invalid_value'}
return false, {'redmew_settings_util.string_invalid_value'}
end,
boolean = function (input)
local input_type = type(input)
@ -63,7 +63,7 @@ local settings_type = {
return true, input ~= 0
end
return false, {'redmew_settings.boolean_invalid_value'}
return false, {'redmew_settings_util.boolean_invalid_value'}
end,
}