diff --git a/idioma.lua b/idioma.lua index c0fe99e..6899f5e 100644 --- a/idioma.lua +++ b/idioma.lua @@ -41,7 +41,7 @@ end -- Acessar menu de seleção de idiomas local acessar_menu_idiomas = function(player) local name = player:get_player_name() - local lang = getlang(name) + local lang = getlang(name) or "en" -- não pode ser nulo -- Idioma selecionado local idioma_sel = "1" diff --git a/lib/mylang.lua b/lib/mylang.lua index 0c2be06..7d97d17 100644 --- a/lib/mylang.lua +++ b/lib/mylang.lua @@ -276,17 +276,17 @@ bd.listar = function(tb) end -- Fim -local respostas = { +local idiomas = { ["en"] = "English language defined.", ["pt"] = "Idioma portugues definido.", ["de"] = "Deutsch Sprache gesetzt.", ["es"] = "Idioma espanol definido.", } local resposta = function(lang) - if not respostas[lang] then + if not idiomas[lang] then return lang.." language code defined" else - return respostas[lang] + return idiomas[lang] end end @@ -310,6 +310,11 @@ minetest.register_chatcommand("mylang", { end local lang = string.lower(param) + -- Verifica se o idioma é aceitavel + if not idiomas[lang] then + return false, "Invalid language code (choose one of these \"en\", \"pt\", \"de\" or \"es\")" + end + -- Salvar escolha definir_idioma(name, lang) @@ -321,7 +326,7 @@ minetest.register_chatcommand("mylang", { -- Pegar idioma salvo local pegar_idioma = function(name) if bd.verif("langs", name) ~= true then - return "en" + return nil end return bd.pegar("langs", name) end diff --git a/xgettext.sh b/xgettext.sh deleted file mode 100755 index 6aebe58..0000000 --- a/xgettext.sh +++ /dev/null @@ -1,29 +0,0 @@ -#! /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=SNS:2,3 \ - --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;