diff --git a/app/assets/js/langloader.js b/app/assets/js/langloader.js index 38a0a6b5..b1f13c96 100644 --- a/app/assets/js/langloader.js +++ b/app/assets/js/langloader.js @@ -33,9 +33,6 @@ exports.queryEJS = function(id, placeHolders){ } exports.setupLanguage = function(){ - // Load a Placeholder Language File for texts that do not require translation - exports.loadLanguage('_placeholder') - // Load Language Files exports.loadLanguage('en_US') // Uncomment this when translations are ready diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 68f6f5de..7db27654 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -953,7 +953,7 @@ function displayArticle(articleObject, index){ text.style.display = text.style.display === 'block' ? 'none' : 'block' } }) - newsNavigationStatus.innerHTML = index + ' of ' + newsArr.length + newsNavigationStatus.innerHTML = Lang.query('ejs.landing.newsNavigationStatus', {currentPage: index, totalPages: newsArr.length}) newsContent.setAttribute('article', index-1) } diff --git a/app/assets/lang/en_US.toml b/app/assets/lang/en_US.toml index bcdc2992..cb99e500 100644 --- a/app/assets/lang/en_US.toml +++ b/app/assets/lang/en_US.toml @@ -13,7 +13,7 @@ launchButton = "PLAY" launchButtonPlaceholder = "• No Server Selected" launchProgressLabel = "0%" launchDetails = "Please wait.." -newsNavigationStatus = "1 of 1" +newsNavigationStatus = "{currentPage} of {totalPages}" newsErrorLoadSpan = "Checking for News.." newsErrorFailedSpan = "Failed to Load News" newsErrorRetryButton = "Try Again" diff --git a/app/landing.ejs b/app/landing.ejs index 51fb7d3f..5e80d8c1 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -184,7 +184,7 @@ - <%- lang('landing.newsNavigationStatus') %> + <%- lang('landing.newsNavigationStatus', { currentPage: 1, totalPages: 1 }) %>