diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 71eb2e74..09fa4b83 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -28,9 +28,15 @@ function getLocalizedString(key) { var translated = I18n // Search current language for the key - keyArr.forEach(function(k) { - translated = translated[k] - }) + try { + keyArr.forEach(function(k) { + translated = translated[k] + }) + } catch (e) { + // Key is missing in selected language so default to english + translated = undefined; + } + // If key is not found, search the fallback language for the key if (translated === undefined) { diff --git a/app/assets/javascripts/recording.js b/app/assets/javascripts/recording.js index 12b446dc..3ff61642 100644 --- a/app/assets/javascripts/recording.js +++ b/app/assets/javascripts/recording.js @@ -26,10 +26,10 @@ $(document).on('turbolinks:load', function(){ // Handle recording emails. $('.email-link').each(function(){ $(this).click(function(){ - var subject = $(".username").text() + " " + t('room.mailer.subject'); - var body = t('room.mailer.body') + "\n\n" + $(this).attr("data-pres-link"); - var autogenerated = t('room.mailer.autogenerated') + "\n"; - var footer = t('room.mailer.footer'); + var subject = $(".username").text() + " " + getLocalizedString('javascript.room.mailer.subject'); + var body = getLocalizedString('javascript.room.mailer.body') + "\n\n" + $(this).attr("data-pres-link"); + var autogenerated = getLocalizedString('javascript.room.mailer.autogenerated') + "\n"; + var footer = getLocalizedString('javascript.room.mailer.footer'); var url = "mailto:?subject=" + encodeURIComponent(subject) + "&body=" + encodeURIComponent(body) + encodeURIComponent(autogenerated) + encodeURIComponent(footer); var win = window.open(url, '_blank');