*5157* Move NLM and OpenURL schemas to plug-ins - make sure that loca…

…les from lib-pkp plugins will also be read, register locale for citation plug-ins
pkp · Oct 30, 2010 · b951f67 · b951f67
1 parent 47b5504
commit b951f67
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/plugins/generic/customLocale/CustomLocaleAction.inc.php b/plugins/generic/customLocale/CustomLocaleAction.inc.php
@@ -10,8 +10,6 @@
  * @class CustomLocaleAction
  *
  * Perform various tasks related to customization of locale strings.
- *
- * $Id$
  */
 
 class CustomLocaleAction {
@@ -24,7 +22,10 @@ function getLocaleFiles($locale) {
 		foreach (array_keys($plugins) as $key) {
 			$plugin =& $plugins[$key];
 			$localeFile = $plugin->getLocaleFilename($locale);
-			if (!empty($localeFile)) $localeFiles[] = $localeFile;
+			if (!empty($localeFile)) {
+				if (is_scalar($localeFile)) $localeFiles[] = $localeFile;
+				if (is_array($localeFile)) $localeFiles = array_merge($localeFiles, $localeFile);
+			}
 			unset($plugin);
 		}
 		return $localeFiles;

diff --git a/plugins/generic/translator/TranslatorAction.inc.php b/plugins/generic/translator/TranslatorAction.inc.php
@@ -12,7 +12,6 @@
  * @brief Perform various tasks related to translation.
  */
 
-//$Id$
 
 class TranslatorAction {
 	/**
@@ -56,7 +55,10 @@ function getLocaleFiles($locale) {
 		foreach (array_keys($plugins) as $key) {
 			$plugin =& $plugins[$key];
 			$localeFile = $plugin->getLocaleFilename($locale);
-			if (!empty($localeFile)) $localeFiles[] = $localeFile;
+			if (!empty($localeFile)) {
+				if (is_scalar($localeFile)) $localeFiles[] = $localeFile;
+				if (is_array($localeFile)) $localeFiles = array_merge($localeFiles, $localeFile);
+			}
 			unset($plugin);
 		}
 		return $localeFiles;
@@ -147,13 +149,20 @@ function testLocale($locale, $referenceLocale) {
 		$plugins =& PluginRegistry::loadAllPlugins();
 		foreach (array_keys($plugins) as $key) {
 			$plugin =& $plugins[$key];
-			$referenceLocaleFilename = $plugin->getLocaleFilename($referenceLocale);
-			if ($referenceLocaleFilename) {
-				$localeFile = new LocaleFile($locale, $plugin->getLocaleFilename($locale));
-				$referenceLocaleFile = new LocaleFile($referenceLocale, $referenceLocaleFilename);
-				$errors = array_merge_recursive($errors, $localeFile->testLocale($referenceLocaleFile));
-				unset($localeFile);
-				unset($referenceLocaleFile);
+			$referenceLocaleFilenames = $plugin->getLocaleFilename($referenceLocale);
+			if ($referenceLocaleFilenames) {
+				if (is_scalar($referenceLocaleFilenames)) $referenceLocaleFilenames = array($referenceLocaleFilenames);
+				$localeFilenames = $plugin->getLocaleFilename($locale);
+				if (is_scalar($localeFilenames)) $localeFilenames = array($localeFilenames);
+				assert(count($localeFilenames) == count($referenceLocaleFilenames));
+				foreach($referenceLocaleFilenames as $index => $referenceLocaleFilename) {
+					assert(isset($localeFilenames[$index]));
+					$localeFile = new LocaleFile($locale, $localeFilenames[$index]);
+					$referenceLocaleFile = new LocaleFile($referenceLocale, $referenceLocaleFilename);
+					$errors = array_merge_recursive($errors, $localeFile->testLocale($referenceLocaleFile));
+					unset($localeFile);
+					unset($referenceLocaleFile);
+				}
 			}
 			unset($plugin);
 		}