lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-xx: Added fallback language to locales (#788)

Browse Source 
* Added fallback language to locales

* Added comments
This commit is contained in:
Ahmad Farhat
2019-09-06 14:28:47 -04:00
committed by Jesus Federico
parent 2090b9f8e6
commit b590a5a264
5 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/main.js
View File

@ -20,4 +20,26 @@ $(document).on('turbolinks:load', function(){
document.addEventListener("turbolinks:before-cache", function() {
$(".alert").remove()
})
})
// Gets the localized string
function getLocalizedString(key) {
var keyArr = key.split(".")
var translated = I18n
// Search current language for the key
keyArr.forEach(function(k) {
translated = translated[k]
})
// If key is not found, search the fallback language for the key
if (translated == undefined) {
translated = I18nFallback
keyArr.forEach(function(k) {
translated = translated[k]
})
}
return translated
}

14
app/assets/javascripts/room.js
View File

@ -32,10 +32,10 @@ $(document).on('turbolinks:load', function(){
if (success) {
inviteURL.blur();
copy.addClass('btn-success');
copy.html("<i class='fas fa-check'></i>" + I18n["copied"])
copy.html("<i class='fas fa-check'></i>" + getLocalizedString("copied"))
setTimeout(function(){
copy.removeClass('btn-success');
copy.html("<i class='fas fa-copy'></i>" + I18n["copy"])
copy.html("<i class='fas fa-copy'></i>" + getLocalizedString("copy"))
}, 2000)
}
});
@ -49,7 +49,7 @@ $(document).on('turbolinks:load', function(){
// Display and update all fields related to creating a room in the createRoomModal
$("#create-room-block").click(function(){
$("#create-room-name").val("")
$("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code_placeholder"])
$("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code_placeholder"))
$("#room_access_code").val(null)
$("#createRoomModal form").attr("action", $("body").data('relative-root'))
@ -94,10 +94,10 @@ $(document).on('turbolinks:load', function(){
accessCode = $(this).closest("#room-block").data("room-access-code")
if(accessCode){
$("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code"] + ": " + accessCode)
$("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code") + ": " + accessCode)
$("#room_access_code").val(accessCode)
} else{
$("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code_placeholder"])
$("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code_placeholder"))
$("#room_access_code").val(null)
}
})
@ -140,11 +140,11 @@ function generateAccessCode(){
accessCode += validCharacters.charAt(Math.floor(Math.random() * validCharacters.length));
}
$("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code"] + ": " + accessCode)
$("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code") + ": " + accessCode)
$("#room_access_code").val(accessCode)
}
function ResetAccessCode(){
$("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code_placeholder"])
$("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code_placeholder"))
$("#room_access_code").val(null)
}