From 29baf3dcc02c28570b01baa6bb095c890263b493 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Wed, 1 Jan 2020 01:27:34 +0200 Subject: [PATCH] Made About & Preferences update translations every time you open them Also fixed "Grey" string, it was supposed to be "Gray" --- Prefabs/Dialogs/AboutDialog.tscn | 1 + Prefabs/Dialogs/PreferencesDialog.tscn | 3 ++- Scripts/Dialogs/AboutDialog.gd | 30 ++++++++++++++----------- Scripts/Dialogs/PreferencesDialog.gd | 31 ++++++++++++++++---------- Translations/Translations.pot | 2 +- Translations/de.po | 2 +- Translations/el.po | 16 ++----------- Translations/en.po | 5 +++-- Translations/fr.po | 2 +- Translations/pl.po | 2 +- Translations/pt_BR.po | 2 +- Translations/ru.po | 2 +- Translations/zh_TW.po | 2 +- 13 files changed, 51 insertions(+), 49 deletions(-) diff --git a/Prefabs/Dialogs/AboutDialog.tscn b/Prefabs/Dialogs/AboutDialog.tscn index 492d7be3c..079fd8a5c 100644 --- a/Prefabs/Dialogs/AboutDialog.tscn +++ b/Prefabs/Dialogs/AboutDialog.tscn @@ -180,6 +180,7 @@ custom_fonts/font = ExtResource( 5 ) text = "Copyright 2019-2020 Orama Interactive" align = 1 [connection signal="about_to_show" from="." to="." method="_on_AboutDialog_about_to_show"] +[connection signal="popup_hide" from="." to="." method="_on_AboutDialog_popup_hide"] [connection signal="pressed" from="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons/Website" to="." method="_on_Website_pressed"] [connection signal="pressed" from="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons/GitHub" to="." method="_on_GitHub_pressed"] [connection signal="pressed" from="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons/Donate" to="." method="_on_Donate_pressed"] diff --git a/Prefabs/Dialogs/PreferencesDialog.tscn b/Prefabs/Dialogs/PreferencesDialog.tscn index b7405bb2b..d547bc01d 100644 --- a/Prefabs/Dialogs/PreferencesDialog.tscn +++ b/Prefabs/Dialogs/PreferencesDialog.tscn @@ -5,7 +5,6 @@ [ext_resource path="res://Assets/Fonts/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3] [node name="PreferencesDialog" type="AcceptDialog"] -visible = true margin_right = 200.0 margin_bottom = 70.0 window_title = "Preferences" @@ -244,6 +243,8 @@ margin_right = 156.0 margin_bottom = 100.0 rect_min_size = Vector2( 64, 20 ) color = Color( 0.63, 0.13, 0.94, 1 ) +[connection signal="about_to_show" from="." to="." method="_on_PreferencesDialog_about_to_show"] +[connection signal="popup_hide" from="." to="." method="_on_PreferencesDialog_popup_hide"] [connection signal="item_selected" from="HSplitContainer/Tree" to="." method="_on_Tree_item_selected"] [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridWidthValue" to="." method="_on_GridWidthValue_value_changed"] [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridHeightValue" to="." method="_on_GridHeightValue_value_changed"] diff --git a/Scripts/Dialogs/AboutDialog.gd b/Scripts/Dialogs/AboutDialog.gd index beea0e790..b048841bf 100644 --- a/Scripts/Dialogs/AboutDialog.gd +++ b/Scripts/Dialogs/AboutDialog.gd @@ -11,19 +11,6 @@ onready var contributors : Tree = $AboutUI/Credits/Contributors/ContributorTree onready var donors : Tree = $AboutUI/Credits/Donors/DonorTree func _ready() -> void: - var groups_root := groups.create_item() - var developers_button := groups.create_item(groups_root) - var contributors_button := groups.create_item(groups_root) - var donors_button := groups.create_item(groups_root) - developers_button.set_text(0, " " + tr("Developers")) - # We use metadata to avoid being affected by translations - developers_button.set_metadata(0, "Developers") - developers_button.select(0) - contributors_button.set_text(0, " " + tr("Contributors")) - contributors_button.set_metadata(0, "Contributors") - donors_button.set_text(0, " " + tr("Donors")) - donors_button.set_metadata(0, "Donors") - var dev_root := developers.create_item() developers.create_item(dev_root).set_text(0, " Manolis Papadeas (Overloaded) - " + tr("Lead Programmer")) developers.create_item(dev_root).set_text(0, " John Nikitakis (Erevos) - " + tr("UI Designer")) @@ -40,6 +27,7 @@ func _ready() -> void: contributors.create_item(contributor_root).set_text(0, " Subhang Nanduri") contributors.create_item(contributor_root).set_text(0, " danielnaoexiste") contributors.create_item(contributor_root).set_text(0, " JunYouIntrovert") + contributors.create_item(contributor_root).set_text(0, " huskee") var donors_root := donors.create_item() donors.create_item(donors_root).set_text(0, " pcmxms") @@ -48,6 +36,22 @@ func _on_AboutDialog_about_to_show() -> void: var current_version : String = ProjectSettings.get_setting("application/config/Version") window_title = tr("About Pixelorama") + " " + current_version + var groups_root := groups.create_item() + var developers_button := groups.create_item(groups_root) + var contributors_button := groups.create_item(groups_root) + var donors_button := groups.create_item(groups_root) + developers_button.set_text(0, " " + tr("Developers")) + # We use metadata to avoid being affected by translations + developers_button.set_metadata(0, "Developers") + developers_button.select(0) + contributors_button.set_text(0, " " + tr("Contributors")) + contributors_button.set_metadata(0, "Contributors") + donors_button.set_text(0, " " + tr("Donors")) + donors_button.set_metadata(0, "Donors") + +func _on_AboutDialog_popup_hide() -> void: + groups.clear() + func _on_Groups_item_selected() -> void: for child in credits.get_children(): if child != groups: diff --git a/Scripts/Dialogs/PreferencesDialog.gd b/Scripts/Dialogs/PreferencesDialog.gd index 719c8e3c9..c14bce513 100644 --- a/Scripts/Dialogs/PreferencesDialog.gd +++ b/Scripts/Dialogs/PreferencesDialog.gd @@ -7,18 +7,6 @@ onready var themes = $HSplitContainer/ScrollContainer/VBoxContainer/Themes onready var grid_guides = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides" func _ready() -> void: - var root := tree.create_item() - var language_button := tree.create_item(root) - var theme_button := tree.create_item(root) - var grid_button := tree.create_item(root) - language_button.set_text(0, " " + tr("Language")) - language_button.set_metadata(0, "Language") - language_button.select(0) - theme_button.set_text(0, " " + tr("Themes")) - theme_button.set_metadata(0, "Themes") - grid_button.set_text(0, " " + tr("Guides & Grid")) - grid_button.set_metadata(0, "Guides & Grid") - for child in languages.get_children(): if child is Button: child.connect("pressed", self, "_on_Language_pressed", [child]) @@ -32,6 +20,25 @@ func _ready() -> void: change_theme(theme_id) themes.get_child(theme_id + 1).pressed = true +func _on_PreferencesDialog_about_to_show() -> void: + var root := tree.create_item() + var language_button := tree.create_item(root) + var theme_button := tree.create_item(root) + var grid_button := tree.create_item(root) + + language_button.set_text(0, " " + tr("Language")) + # We use metadata to avoid being affected by translations + language_button.set_metadata(0, "Language") + language_button.select(0) + theme_button.set_text(0, " " + tr("Themes")) + theme_button.set_metadata(0, "Themes") + grid_button.set_text(0, " " + tr("Guides & Grid")) + grid_button.set_metadata(0, "Guides & Grid") + + +func _on_PreferencesDialog_popup_hide() -> void: + tree.clear() + func _on_Tree_item_selected() -> void: for child in right_side.get_children(): child.visible = false diff --git a/Translations/Translations.pot b/Translations/Translations.pot index bdee42999..80b5018ff 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -208,7 +208,7 @@ msgstr "" msgid "Dark" msgstr "" -msgid "Grey" +msgid "Gray" msgstr "" msgid "Gold" diff --git a/Translations/de.po b/Translations/de.po index e13747d9e..2c725ba92 100644 --- a/Translations/de.po +++ b/Translations/de.po @@ -228,7 +228,7 @@ msgstr "Systemsprache" msgid "Dark" msgstr "Verdunkeln" -msgid "Grey" +msgid "Gray" msgstr "" msgid "Gold" diff --git a/Translations/el.po b/Translations/el.po index 51404fdf6..0a4f64648 100644 --- a/Translations/el.po +++ b/Translations/el.po @@ -122,14 +122,12 @@ msgstr "Άνοιγμα αρχείου/ων" msgid "IMPORT_FILE_LABEL" msgstr "Εισαγωγή ως νέο καρέ" - msgid "IMPORT_SPRITESHEET" msgstr "Εισαγωγή φύλλου καρέ" msgid "Save Sprite as .pxo" msgstr "Αποθήκευση εικόνας ως .pxo" - msgid "Export Sprite as .png" msgstr "Εξαγωγή εικόνας ως .png" @@ -142,15 +140,12 @@ msgstr "Το άρχειο υπάρχει, να γίνει αντικατάστα msgid "Resize:" msgstr "Αλλαγή μεγέθους:" - msgid "EXPORT_CURRENT_FRAME_LABEL" msgstr "Εξαγωγή αυτού του καρέ" - msgid "EXPORT_FRAMES_AS_MULTIPLE_FILES_LABEL" msgstr "Εξαγωγή καρέ σε ξεχωριστά αρχεία" - msgid "EXPORT_FRAMES_AS_SPRITESHEET_LABEL" msgstr "Εξαγωγή καρέ ως φύλλο καρέ" @@ -187,7 +182,6 @@ msgstr "Κυβική" msgid "Trilinear" msgstr "Τριγραμμική" - msgid "Language" msgstr "Γλώσσα:" @@ -197,7 +191,6 @@ msgstr "Θέματα:" msgid "Guides & Grid" msgstr "Οδηγοί και Πλέγμα:" - msgid "Language options" msgstr "Επιλογές Γλώσσας" @@ -219,17 +212,15 @@ msgstr "Γλώσσα:" msgid "System Language" msgstr "Γλώσσα Συστήματος" - msgid "Dark" msgstr "Σκούρο" -msgid "Grey" +msgid "Gray" msgstr "Γκρι" msgid "Gold" msgstr "Χρυσό" - msgid "Light" msgstr "Φωτεινό" @@ -257,7 +248,6 @@ msgstr "Εμφάνιση οθόνης εκκίνησης" msgid "Issue Tracker" msgstr "Καταγραφές προβλημάτων" - msgid "Changelog" msgstr "Καταγραφές αλλαγών" @@ -408,11 +398,9 @@ msgstr "Επιλέξτε ένα πινέλο" msgid "Brush: Pixel" msgstr "Πινέλο: Εικονοστοιχείο" - msgid "Brush: Circle" msgstr "Πινέλο: Κύκλος" - msgid "Brush: Filled Circle" msgstr "Πινέλο: Κύκλος με Γέμισμα" @@ -661,8 +649,8 @@ msgstr "Το αρχείο αποθηκεύτηκε" msgid "File exported" msgstr "Έγινε εξαγωγή αρχείου" -# split screen button translations (deprecated), left for future reference +# split screen button translations (deprecated), left for future reference #~ msgid "SPLITSCREEN_HT" #~ msgstr "" #~ "Διπλή οθόνη\n" diff --git a/Translations/en.po b/Translations/en.po index 0452d5f42..33f143f79 100644 --- a/Translations/en.po +++ b/Translations/en.po @@ -215,8 +215,8 @@ msgstr "System Language" msgid "Dark" msgstr "Dark" -msgid "Grey" -msgstr "Grey" +msgid "Gray" +msgstr "Gray" msgid "Gold" msgstr "Gold" @@ -644,6 +644,7 @@ msgstr "File saved" msgid "File exported" msgstr "File exported" + #~ msgid "SPLITSCREEN_HT" #~ msgstr "" #~ "Split screen\n" diff --git a/Translations/fr.po b/Translations/fr.po index ae02a16be..4d2b7de51 100644 --- a/Translations/fr.po +++ b/Translations/fr.po @@ -225,7 +225,7 @@ msgstr "Langue système" msgid "Dark" msgstr "Assombrir" -msgid "Grey" +msgid "Gray" msgstr "" msgid "Gold" diff --git a/Translations/pl.po b/Translations/pl.po index 26e6ebfce..a8b649d38 100644 --- a/Translations/pl.po +++ b/Translations/pl.po @@ -225,7 +225,7 @@ msgstr "Język systemowy" msgid "Dark" msgstr "Przyciemnianie" -msgid "Grey" +msgid "Gray" msgstr "" msgid "Gold" diff --git a/Translations/pt_BR.po b/Translations/pt_BR.po index e5a11f551..74f27a95a 100644 --- a/Translations/pt_BR.po +++ b/Translations/pt_BR.po @@ -225,7 +225,7 @@ msgstr "Linguagem do Sistema" msgid "Dark" msgstr "Escurecer" -msgid "Grey" +msgid "Gray" msgstr "" msgid "Gold" diff --git a/Translations/ru.po b/Translations/ru.po index dcae141f1..8659cfbd3 100644 --- a/Translations/ru.po +++ b/Translations/ru.po @@ -225,7 +225,7 @@ msgstr "Системный язык" msgid "Dark" msgstr "Затемнить" -msgid "Grey" +msgid "Gray" msgstr "" msgid "Gold" diff --git a/Translations/zh_TW.po b/Translations/zh_TW.po index 9f7bfd8f4..f41fed133 100644 --- a/Translations/zh_TW.po +++ b/Translations/zh_TW.po @@ -225,7 +225,7 @@ msgstr "系統語言" msgid "Dark" msgstr "變暗" -msgid "Grey" +msgid "Gray" msgstr "" msgid "Gold"