blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed user_language property from FHC_JS_DATA_STORAGE_OBJECT

Browse Source 
To persist on a consistent translation system, the translation should be
performed by phrases system on serversite.
Therefore the user_language property is removed from
FHC_JS_DATA_STORAGE_OBJECT.
This commit is contained in:
Cris
2020-04-20 14:55:01 +02:00
parent 971e239d8e
commit 637dbefce0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/helpers/hlp_header_helper.php
+1 -2
View File
@@ -78,8 +78,7 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
app_root: "'.APP_ROOT.'", app_root: "'.APP_ROOT.'",
ci_router: "'.$indexPage.'", ci_router: "'.$indexPage.'",
called_path: "'.$calledPath.'", called_path: "'.$calledPath.'",
called_method: "'.$calledMethod.'", called_method: "'.$calledMethod.'"
user_language: "'.$user_language.'"
};'; };';
$toPrint .= "\n"; $toPrint .= "\n";
$toPrint .= '</script>'; $toPrint .= '</script>';
public/js/TableWidget.js
+2 -2
View File
@@ -563,7 +563,7 @@ var FHC_TableWidget = {
tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML); tableWidgetDiv.find('#tableWidgetHeader').append(tabulatorHeaderHTML);
// Render the collapsable div triggered by button in tableWidgetHeader // Render the collapsable div triggered by button in tableWidgetHeader
var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv, FHC_JS_DATA_STORAGE_OBJECT.user_language); var tabulatorHeaderCollapseHTML = _renderTabulatorHeaderCollapseHTML(tableWidgetDiv);
tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML); tableWidgetDiv.find('#tableWidgetHeader').after(tabulatorHeaderCollapseHTML);
/** /**
@@ -777,7 +777,7 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv){
} }
// Returns collapsable HTML element for TableWidget header buttons // Returns collapsable HTML element for TableWidget header buttons
function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv, language){ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){
var tableUniqueId = tableWidgetDiv.attr('tableUniqueId'); var tableUniqueId = tableWidgetDiv.attr('tableUniqueId');