Merge branch 'en-lang'

game/00src/translation.rpy

@@ -64,7 +64,7 @@ init python:
     notice = _("NOTICE: Please keep in mind this is a fan translation, and as such it may not be completely accurate to the original intent of any written lines.")
 
     languages = [
-        {'image': 'gui/flag/USofA.png', 'name': 'English', 'value': None },
+        {'image': 'gui/flag/USofA.png', 'name': 'English', 'value': 'en' },
         {'image': 'gui/flag/Mexico.png', 'name': 'Español', 'value': 'es'}, #total ESL win
         {'image': 'gui/flag/Russia.png', 'name': 'Русский', 'value': 'ru'}, # We did our part! @Snootranslators
         {'image': 'gui/flag/Poland.png', 'name': 'Polski', 'value': 'pl'}, # hello there
@@ -134,7 +134,7 @@ screen lang_sel():
                                 imagebutton:
                                     idle darkie(languages[i]["image"])
                                     hover glowie(languages[i]["image"])
-                                    action If(languages[i]["value"] in persistent.seenWarning or languages[i]["value"] == None,
+                                    action If(languages[i]["value"] in persistent.seenWarning or languages[i]["value"] == 'en', 
                                         true = [Language(languages[i]["value"]), Return()],
                                         # Important to change the language before calling notice. Otherwise it will be in english.
                                         false = [Language(languages[i]["value"]), AddToSet(set=persistent.seenWarning, value=languages[i]["value"]), Show(screen="OkPrompt", message=notice, go_menu=False)]
@@ -150,7 +150,7 @@ screen lang_button(lang):
         spacing 15
         textbutton lang["name"]:
             activate_sound "audio/ui/snd_ui_click.wav"
-            action If(lang["value"] in persistent.seenWarning or lang["value"] == None,
+            action If(lang["value"] in persistent.seenWarning or lang["value"] == 'en', 
             true = [Language(lang["value"])],
             false = [Language(lang["value"]), AddToSet(set=persistent.seenWarning, value=lang["value"]), Show(screen="hiddenOkPrompt", message=notice, go_menu=False)]
             )

game/script.rpy

@@ -42,6 +42,9 @@ define config.defer_tl_scripts = True
 label before_main_menu:
     $ renpy.music.play("<loop 61.931333>" + DEFAULT_MUSIC_FILEPATH + "mus_titlescreen" + DEFAULT_MUSIC_EXTENSION, channel="music", loop=True)
 
+    if preferences.language == None:
+        $ preferences.language = 'en'
+
     if (persistent.languaged_up is None):
         $ preferences.set_volume('ui', config.default_sfx_volume)
         $ persistent.languaged_up = True