diff --git a/app/lib/auth.coffee b/app/lib/auth.coffee index 18cf4f661..55e544a26 100644 --- a/app/lib/auth.coffee +++ b/app/lib/auth.coffee @@ -38,6 +38,7 @@ module.exports.createUserWithoutReload = (userObject, failure=backboneFailure) - }) module.exports.loginUser = (userObject, failure=genericFailure) -> + console.log 'logging in as', userObject.email jqxhr = $.post('/auth/login', { username: userObject.email, diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index 7cf70c0e2..f65366400 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi recover: recover_account_title: "إستعادة حساب" send_password: "إرسال كلمة سرّ الإستعادة" +# recovery_sent: "Recovery email sent." signup: create_account_title: "إنشاء حساب لحفظ التقدّم" @@ -142,7 +143,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi forum_suffix: "بدلا من ذلك." send: "إرسال تعليقات" contact_candidate: "الاتصال المرشح" -# recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." +# recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." diplomat_suggestion: title: "مساعدة في ترجمة CodeCombat!" @@ -152,7 +153,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi learn_more: "معرفة المزيد عن كونك دبلوماسي" subscribe_as_diplomat: "الاشتراك كدبلوماسي" - wizard_settings: title: "إعدادات الساحر" customize_avatar: "الصورة الرمزية الخاصة بك" diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index aae8af711..ef8ac604f 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "български език", englishDescri recover: recover_account_title: "Възстанови Акаунт" send_password: "Изпрати парола за възстановяване" +# recovery_sent: "Recovery email sent." signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index d60268d9c..729d8d0f4 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr recover: recover_account_title: "Recuperar Compte" send_password: "Enviar contrasenya oblidada" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Crear un compte per tal de guardar els progressos" diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index 176b43436..7ebe1352c 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr recover: recover_account_title: "Obnovení účtu" send_password: "Zaslat nové heslo" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Vytvořit účet k uložení úrovně" diff --git a/app/locale/da.coffee b/app/locale/da.coffee index c0abcd8bc..acd7b89b7 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans recover: recover_account_title: "genskab konto" send_password: "Send kodeord" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Opret en konto for at gemme dit fremskridt" diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee index f4b86c655..7822a8dd5 100644 --- a/app/locale/de-AT.coffee +++ b/app/locale/de-AT.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: recover: recover_account_title: "Account Wiederherstellung" send_password: "Wiederherstellungskennwort senden" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Account anlegen, um Fortschritt zu speichern" diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee index c606d8198..0453fb142 100644 --- a/app/locale/de-CH.coffee +++ b/app/locale/de-CH.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge recover: recover_account_title: "Account wiederherstelle" send_password: "Recovery Password sende" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Erstell en Account zum din Fortschritt speichere" diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index 588e0062a..5c5d3691c 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: recover: recover_account_title: "Account Wiederherstellung" send_password: "Wiederherstellungskennwort senden" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Account anlegen, um Fortschritt zu speichern" diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 7d2f1a2fe..154ba1ed7 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre recover: recover_account_title: "Κάντε ανάκτηση του λογαριασμού σας" send_password: "Αποστολή κωδικού ανάκτησης" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Δημιουργία λογαριασμού για αποθήκευση της προόδου" diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index 891c2897f..1bb9e13d6 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index 8461e0af9..f03044905 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index 05a5e5e2d..5c65095d5 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/en.coffee b/app/locale/en.coffee index dc649ca9b..00ab55e30 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -79,6 +79,7 @@ recover: recover_account_title: "Recover Account" send_password: "Send Recovery Password" + recovery_sent: "Recovery email sent." signup: create_account_title: "Create Account to Save Progress" diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index edcbaa7f2..2e2213348 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip recover: recover_account_title: "recuperar cuenta" send_password: "Enviar Contraseña de Recuperación" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Crear Cuenta para Guardar el Progreso" diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index 43b0a467e..6344629f7 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis recover: recover_account_title: "Recuperar Cuenta" send_password: "Enviar recuperación de contraseña" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Crea una cuenta para guardar tu progreso" @@ -450,13 +451,13 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis guide_caption: "Documentos y pistas" multiplayer_caption: "Juega con amigos!" - inventario: - temp: "Temp" +# inventory: +# temp: "Temp" # choose_hero: # temp: "Temp" -# save_load: + save_load: granularity_saved_games: "Salvado" granularity_change_history: "Historia" @@ -891,7 +892,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis blurb_5: "(Habra dos ganadores por puesto, dos en el primer puesto, dos en el segundo, etc.)" rank: "Rango" prizes: "Premios" - Total_value: "Valor Total" + total_value: "Valor Total" in_cash: "en dinero" custom_wizard: "Personaliza tu Mago de CodeCombat" custom_avatar: "Personaliza tu avatar de CoceCombat" diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index defa5d528..0dd6e0e94 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", recover: recover_account_title: "بازیابی حساب کاربری" send_password: "ارسال رمز عبور بازیابی شده" +# recovery_sent: "Recovery email sent." signup: create_account_title: "ایجاد حساب کاربری برای ذخیره سازی پیشرفت ها" diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index d7ed5c3ff..08153e7a9 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index b1b6721a2..5254dbfa3 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t recover: recover_account_title: "Récupérer son compte" send_password: "Envoyer le mot de passe de récupération" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Créer un compte pour sauvegarder votre progression" diff --git a/app/locale/he.coffee b/app/locale/he.coffee index 13be7e5ba..c64984ae4 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", recover: recover_account_title: "שחזר סיסמה" send_password: "שלח סיסמה חדשה" +# recovery_sent: "Recovery email sent." signup: create_account_title: "הירשם כדי לשמור את התקדמותך" diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index 009f3970a..fe176003a 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index 07568fcb3..4197cbdb8 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t recover: recover_account_title: "Meglévő fiók visszaállítása" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/id.coffee b/app/locale/id.coffee index d92424365..e5b328776 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/it.coffee b/app/locale/it.coffee index 873d2507e..4bf2a3163 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t recover: recover_account_title: "Recupera account" send_password: "Invia password di recupero" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Crea un account per salvare le partite" diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index 2652b8b2d..2e8d159ed 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", recover: recover_account_title: "パスワードを忘れた場合" send_password: "送信する" +# recovery_sent: "Recovery email sent." signup: create_account_title: "進行状況保存用のアカウント作成" diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index a0cb1f148..8d4e8f17f 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t recover: recover_account_title: "계정 복구" send_password: "복구 비밀번호 전송" +# recovery_sent: "Recovery email sent." signup: create_account_title: "진행 상황을 저장하기 위해서 새 계정을 생성합니다" diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index 9b3a82b3e..878c55b67 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index 9fe966333..d33dbbae5 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa recover: recover_account_title: "Dapatkan Kembali Akaun" send_password: "Hantar kembali kata-laluan" +# recovery_sent: "Recovery email sent." signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index b0219c840..92ca03eb9 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index 69ca23507..406f52712 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: recover: recover_account_title: "Herstel Account" send_password: "Verzend nieuw wachtwoord" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Maak een account aan om je vooruitgang op te slaan" diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index 24a47b4b2..0be1161de 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription recover: recover_account_title: "Herstel Account" send_password: "Verzend nieuw wachtwoord" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Maak een account aan om je vooruitgang op te slaan" diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index 0fac8274c..1ef1488f7 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/no.coffee b/app/locale/no.coffee index bbef9e0f4..e249011b5 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index 277a6285b..d46bf195d 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish recover: recover_account_title: "Odzyskaj konto" send_password: "Wyślij hasło tymczasowe" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Stwórz konto, aby zapisać postępy" @@ -203,8 +204,8 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish password_mismatch: "Hasła róznią się od siebie" password_repeat: "Powtórz swoje hasło." job_profile: "Profil zatrudnienia" -# job_profile_approved: "Twój profil zatrudnienia został zaakceptowany przez CodeCombat. Pracodawcy będą mogli go widzieć dopóki nie oznaczysz go jako nieaktywny lub nie będzie on zmieniany przez 4 tygodnie." -# job_profile_explanation: "Witaj! Wypełnij to, a będziemy w kontakcie w sprawie znalezienie dla Ciebe pracy twórcy oprogramowania." + job_profile_approved: "Twój profil zatrudnienia został zaakceptowany przez CodeCombat. Pracodawcy będą mogli go widzieć dopóki nie oznaczysz go jako nieaktywny lub nie będzie on zmieniany przez 4 tygodnie." + job_profile_explanation: "Witaj! Wypełnij to, a będziemy w kontakcie w sprawie znalezienie dla Ciebe pracy twórcy oprogramowania." sample_profile: "Zobacz przykładowy profil" view_profile: "Zobacz swój profil" diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index e0426fb54..8127d9f8e 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: recover: recover_account_title: "Recuperar conta" send_password: "Recuperar senha" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Criar conta para salvar progresso" diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index ff99c6d08..5a29ba6e1 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: recover: recover_account_title: "Recuperar Conta" send_password: "Enviar Password de Recuperação" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Criar Conta para Guardar Progresso" diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index 6635760a6..c39072a03 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman recover: recover_account_title: "Recuperează Cont" send_password: "Trimite parolă de recuperare" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Crează cont pentru a salva progresul" diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 4207644b2..2b51243ff 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi recover: recover_account_title: "Восстановить аккаунт" send_password: "Отправить пароль для восстановления" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Создать аккаунт, чтобы сохранить прогресс" diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index 23a974692..70cd9fae3 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", recover: recover_account_title: "Obnov účet" send_password: "Zašli záchranné heslo" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Vytvor si účet, nech si uložíš progres" diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index f60097498..5ae40cabe 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index 8d78918d9..3a12c7f0b 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian recover: recover_account_title: "Поврати налог" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index 74027a61d..bd2f27153 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr recover: recover_account_title: "Återskapa ditt konto" send_password: "Skicka återskapningslösenord" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Skapa ett konto för att spara dina framsteg" diff --git a/app/locale/th.coffee b/app/locale/th.coffee index 8f28b84cf..3d01814eb 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." signup: create_account_title: "สร้างบัญชีใหม่เพื่อบันทึกความก้าวหน้า" diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index ec48b6633..a4598faaf 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t recover: recover_account_title: "Hesabı Kurtar" send_password: "Kurtarma Parolası Gönder" +# recovery_sent: "Recovery email sent." signup: create_account_title: "İlerlemenizi Kaydetmek için Hesap Oluşturun" diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index 4b13cf117..333b3055c 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "українська мова", englishDesc recover: recover_account_title: "Відновити акаунт" send_password: "Надіслати пароль відновлення" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Створити акаунт, щоб зберегти прогрес" diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index a7ed65e5e..950876551 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index 724ff27b3..d8f6faccd 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn recover: recover_account_title: "Khôi phục tài khoản" send_password: "Gởi mật mã khôi phục" +# recovery_sent: "Recovery email sent." signup: create_account_title: "Tạo tài khoản để lưu tiến trình" diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index 468637d56..999dd0cd3 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese recover: recover_account_title: "找回账户" send_password: "发送重置链接" +# recovery_sent: "Recovery email sent." signup: create_account_title: "创建一个账户来保存进度" diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index d23ce2dac..8eafc71b1 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese recover: recover_account_title: "復原帳號" send_password: "送出新密碼" +# recovery_sent: "Recovery email sent." signup: create_account_title: "建立帳號儲存進度" diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee index 5e3984c52..c06494948 100644 --- a/app/locale/zh-WUU-HANS.coffee +++ b/app/locale/zh-WUU-HANS.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # recover: # recover_account_title: "Recover Account" # send_password: "Send Recovery Password" +# recovery_sent: "Recovery email sent." # signup: # create_account_title: "Create Account to Save Progress" diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee index a29d250ba..371e51787 100644 --- a/app/locale/zh-WUU-HANT.coffee +++ b/app/locale/zh-WUU-HANT.coffee @@ -79,6 +79,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio recover: recover_account_title: "賬號尋轉" send_password: "發轉設鏈接畀我" +# recovery_sent: "Recovery email sent." signup: create_account_title: "做新賬號來存進度" diff --git a/app/schemas/subscriptions/tome.coffee b/app/schemas/subscriptions/tome.coffee index fde7c41d1..1834d2834 100644 --- a/app/schemas/subscriptions/tome.coffee +++ b/app/schemas/subscriptions/tome.coffee @@ -36,6 +36,13 @@ module.exports = 'tome:reload-code': c.object {title: 'Reload Code', description: 'Published when you reset a spell to its original source', required: ['spell']}, spell: {type: 'object'} + 'tome:palette-cleared': c.object {title: 'Palette Cleared', description: 'Published when the spell palette is about to be cleared and recreated.'}, + thang: {type: 'object'} + + 'tome:palette-updated': c.object {title: 'Palette Updated', description: 'Published when the spell palette has just been updated.'}, + thang: {type: 'object'} + entries: {type: 'array'} + 'tome:palette-hovered': c.object {title: 'Palette Hovered', description: 'Published when you hover over a Thang in the spell palette', required: ['thang', 'prop', 'entry']}, thang: {type: 'object'} prop: {type: 'string'} diff --git a/app/views/modal/RecoverModal.coffee b/app/views/modal/RecoverModal.coffee index cb7781bed..fa293002e 100644 --- a/app/views/modal/RecoverModal.coffee +++ b/app/views/modal/RecoverModal.coffee @@ -37,5 +37,5 @@ module.exports = class RecoverModal extends ModalView successfullyRecovered: => @disableModalInProgress(@$el) - @$el.find('.modal-body:visible').text('Recovery email sent.') + @$el.find('.modal-body:visible').text($.i18n.t('recover.recovery_sent')) @$el.find('.modal-footer').remove() diff --git a/app/views/play/level/tome/SpellPaletteView.coffee b/app/views/play/level/tome/SpellPaletteView.coffee index 6c00bd785..7494875cf 100644 --- a/app/views/play/level/tome/SpellPaletteView.coffee +++ b/app/views/play/level/tome/SpellPaletteView.coffee @@ -53,6 +53,7 @@ module.exports = class SpellPaletteView extends CocoView @$el.find('.code-language-logo').removeClass().addClass 'code-language-logo ' + language createPalette: -> + Backbone.Mediator.publish 'tome:palette-cleared', {thang: thang} lcs = @supermodel.getModels LevelComponent allDocs = {} excludedDocs = {} @@ -135,7 +136,7 @@ module.exports = class SpellPaletteView extends CocoView if thisName = {coffeescript: '@', lua: 'self', clojure: 'self'}[@options.language] if @entryGroupNames.this @entryGroupNames.this = thisName - null + Backbone.Mediator.publish 'tome:palette-updated', entries: @entries addEntry: (doc, shortenize, tabbify, isSnippet=false) -> writable = (if _.isString(doc) then doc else doc.name) in (@thang.apiUserProperties ? [])