Tweak to plugin manager so we always load the default language for a …

…plugin, then the current language, so untranslated strings fall back to default. Prior to this we were only loading the default if no translation for current existed.

components/com_fabrik/models/pluginmanager.php

@@ -348,11 +348,14 @@ public function loadPlugIn($className = '', $group = '')
 		$langFile = 'plg_' . $folder . '_' . $className;
 		$langPath = $client->path . '/plugins/' . $folder . '/' . $className;
 
-		$lang->load($langFile, $langPath, null, false, false) || $lang->load($langFile, $langPath, $lang->getDefault(), false, false);
+		// load both default and current, so untranslated strings fall back to default
+		$lang->load($langFile, $langPath, $lang->getDefault(), false, false);
+		$lang->load($langFile, $langPath, null, false, false);
 
 		// Load system ini file
 		$langFile .= '.sys';
-		$lang->load($langFile, $langPath, null, false, false) || $lang->load($langFile, $langPath, $lang->getDefault(), false, false);
+		$lang->load($langFile, $langPath, $lang->getDefault(), false, false);
+		$lang->load($langFile, $langPath, null, false, false);
 
 		if (!is_object($plugIn))
 		{
@@ -482,7 +485,10 @@ public function getFormPlugins(&$form)
 
 				$langFile = 'plg_' . $folder . '_' . $element->plugin;
 				$langPath = $client->path . '/plugins/' . $folder . '/' . $element->plugin;
-				$lang->load($langFile, $langPath, null, false, false) || $lang->load($langFile, $langPath, $lang->getDefault(), false, false);
+
+				// load both default and current, so untranslated strings fall back to default
+				$lang->load($langFile, $langPath, $lang->getDefault(), false, false);
+				$lang->load($langFile, $langPath, null, false, false);
 
 				$listModel = $form->getListModel();
 				$pluginModel->setContext($groupModel, $form, $listModel);