diff --git a/front/js/pialert_common.js b/front/js/pialert_common.js index b75f7d45..995ade83 100755 --- a/front/js/pialert_common.js +++ b/front/js/pialert_common.js @@ -162,7 +162,7 @@ function cacheStrings() }); // handle strings and translations from plugins - $.get('api/table_language_strings.json', function(res) { + $.get('api/table_plugins_language_strings.json', function(res) { data = res["data"]; @@ -193,9 +193,14 @@ function getString (key) { } result = getCache(`pia_lang_${key}_${lang_code}`, true); + if(isEmpty(result)) { + console.log(`pia_lang_${key}_${lang_code}`) + console.log(key) result = getCache(`pia_lang_${key}_en_us`, true); + console.log(result) + } return result; diff --git a/front/pluginsCore.php b/front/pluginsCore.php index a2d02324..d7e9226e 100755 --- a/front/pluginsCore.php +++ b/front/pluginsCore.php @@ -136,38 +136,6 @@ function saveData (id) { }); } -// ----------------------------------------------------------------------------- -// Get translated string -function localize (obj, key) { - - currLangCode = getCookie("language") - - result = "" - en_us = "" - - if(obj.localized && obj.localized.includes(key)) - { - for(i=0;i - - ${localize(pluginObj, 'icon')} ${localize(pluginObj, 'display_name')} + + ${getString(`${prefix}_icon`)} ${getString(`${prefix}_display_name`)} ` ); @@ -238,13 +207,14 @@ function generateTabs() evRows = "" obRows = "" hiRows = "" + prefix = pluginObj.unique_prefix; // Generate the header $.each(pluginObj["database_column_definitions"], function(index, colDef){ if(colDef.show == true) // select only the ones to show { colDefinitions.push(colDef) - headersHtml += `${localize(colDef, "name" )}` + headersHtml += `${getString(`${prefix}_${colDef.column}_name` )}` } }); @@ -252,7 +222,7 @@ function generateTabs() var eveCount = 0; for(i=0;i= 0;i--) // from latest to the oldest { - if(pluginHistory[i].Plugin == pluginObj.unique_prefix) + if(pluginHistory[i].Plugin == prefix) { if(histCount < 50) // only display 50 entries to optimize performance { @@ -293,7 +263,7 @@ function generateTabs() var obCount = 0; for(var i=0;i +
  • - + (${obCount}) @@ -325,7 +295,7 @@ function generateTabs()
  • - + (${eveCount}) @@ -333,7 +303,7 @@ function generateTabs()
  • - + (${histCountDisplayed} ${histCount}) @@ -346,7 +316,7 @@ function generateTabs()
    -
    +
    @@ -356,10 +326,10 @@ function generateTabs()
    - +
    -
    +
    @@ -370,10 +340,10 @@ function generateTabs()
    - +
    -
    +
    @@ -384,7 +354,7 @@ function generateTabs()
    - +
    @@ -393,7 +363,7 @@ function generateTabs()
    - ${localize(pluginObj, 'description')} + ${getString(prefix + '_description')} diff --git a/pialert/api.py b/pialert/api.py index ff725180..16332095 100755 --- a/pialert/api.py +++ b/pialert/api.py @@ -34,7 +34,7 @@ def update_api(db, isNotification = False, updateOnlyDataSources = []): ["plugins_events", sql_plugins_events], ["plugins_history", sql_plugins_history], ["plugins_objects", sql_plugins_objects], - ["language_strings", sql_language_strings], + ["plugins_language_strings", sql_language_strings], ["custom_endpoint", conf.API_CUSTOM_SQL], ] diff --git a/pialert/initialise.py b/pialert/initialise.py index aeaaba64..3c3ac6ea 100755 --- a/pialert/initialise.py +++ b/pialert/initialise.py @@ -252,8 +252,16 @@ def importConfigs (db): conf.mySchedules.append(schedule_class(pref, newSchedule, newSchedule.next(), False)) # Collect settings related language strings + # Creates an entry with key ARPSCAN_CMD_name collect_lang_strings(db, set, pref + "_" + set["function"]) + # Collect column related language strings + for clmn in plugin.get('database_column_definitions', []): + # Creates an entry with key ARPSCAN_Object_PrimaryID_name + collect_lang_strings(db, clmn, pref + "_" + clmn.get("column", "")) + + + conf.plugins_once_run = False # ----------------- # Plugins END diff --git a/pialert/plugin.py b/pialert/plugin.py index f81921fb..b34a88c9 100755 --- a/pialert/plugin.py +++ b/pialert/plugin.py @@ -301,6 +301,7 @@ def execute_plugin(db, plugin, pluginsState = plugins_state() ): sql.executemany ("""INSERT INTO Plugins_History ("Plugin", "Object_PrimaryID", "Object_SecondaryID", "DateTimeCreated", "DateTimeChanged", "Watched_Value1", "Watched_Value2", "Watched_Value3", "Watched_Value4", "Status" ,"Extra", "UserData", "ForeignKey") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""", sqlParams) db.commitDB() + # create objects pluginsState = process_plugin_events(db, plugin, pluginsState) # update API endpoints @@ -532,7 +533,7 @@ def process_plugin_events(db, plugin, pluginsState): sql.execute ("INSERT INTO Plugins_Events (Plugin, Object_PrimaryID, Object_SecondaryID, DateTimeCreated, DateTimeChanged, Watched_Value1, Watched_Value2, Watched_Value3, Watched_Value4, Status, Extra, UserData, ForeignKey) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", (plugObj.pluginPref, plugObj.primaryId , plugObj.secondaryId , createdTime, plugObj.changed , plugObj.watched1 , plugObj.watched2 , plugObj.watched3 , plugObj.watched4 , plugObj.status , plugObj.extra, plugObj.userData, plugObj.foreignKey )) - # Perform databse table mapping if enabled for the plugin + # Perform database table mapping if enabled for the plugin if len(pluginEvents) > 0 and "mapped_to_table" in plugin: # Initialize an empty list to store SQL parameters.