diff --git a/app/assets/javascripts/room.js.erb b/app/assets/javascripts/room.js similarity index 88% rename from app/assets/javascripts/room.js.erb rename to app/assets/javascripts/room.js index ab631e7d..bd7d9e93 100644 --- a/app/assets/javascripts/room.js.erb +++ b/app/assets/javascripts/room.js @@ -32,10 +32,10 @@ $(document).on('turbolinks:load', function(){ if (success) { inviteURL.blur(); copy.addClass('btn-success'); - copy.html(" <%= I18n.t("copied") %>") + copy.html("" + I18n["copied"]) setTimeout(function(){ copy.removeClass('btn-success'); - copy.html(" <%= I18n.t("copy") %>") + copy.html("" + I18n["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.t("modal.create_room.access_code_placeholder") %>") + $("#create-room-access-code").text(I18n["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.t('modal.create_room.access_code') %>: " + accessCode) + $("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code"] + ": " + accessCode) $("#room_access_code").val(accessCode) } else{ - $("#create-room-access-code").text("<%= I18n.t('modal.create_room.access_code_placeholder') %>") + $("#create-room-access-code").text(I18n["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.t("modal.create_room.access_code") %>: " + accessCode) + $("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code"] + ": " + accessCode) $("#room_access_code").val(accessCode) } function ResetAccessCode(){ - $("#create-room-access-code").text("<%= I18n.t("modal.create_room.access_code_placeholder") %>") + $("#create-room-access-code").text(I18n["modal"]["create_room"]["access_code_placeholder"]) $("#room_access_code").val(null) } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 42bcce1d..b9951fcb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -102,7 +102,7 @@ module ApplicationHelper # Return all the translations available in the client side through javascript def current_translations @translations ||= I18n.backend.send(:translations) - @translations[I18n.locale].with_indifferent_access[:javascript] || {} + @translations[I18n.locale].with_indifferent_access end # Returns the page that the logo redirects to when clicked on diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f37c4d04..3c58ec9d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -45,23 +45,8 @@ <%= stylesheet_link_tag themes_primary_path %>