aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-18 14:03:55 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-18 14:03:55 +0000
commiteba0bbe90e6e2a76ddeefd46d1c314aae64bac3f (patch)
treecbf38a0027395d3f51dc159a0cc4f6722c72b415 /engine
parentb57290bb2935132ee136d48701ebbcfc0fdad9a4 (diff)
downloadelgg-eba0bbe90e6e2a76ddeefd46d1c314aae64bac3f.tar.gz
elgg-eba0bbe90e6e2a76ddeefd46d1c314aae64bac3f.tar.bz2
Closes #883: Using different operator logic so that plugins can replace existing translation entries.
git-svn-id: https://code.elgg.org/elgg/trunk@3165 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/languages.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index 71ed57bcf..6935a49bd 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -38,10 +38,7 @@
if (!isset($CONFIG->translations[$country_code])) {
$CONFIG->translations[$country_code] = $language_array;
} else {
- //$CONFIG->translations[$country_code] = array_merge($CONFIG->translations[$country_code],$language_array);
- $CONFIG->translations[$country_code] += $language_array;
- //foreach ($language_array as $key => $value)
- // $CONFIG->translations[$country_code][$key] = $value;
+ $CONFIG->translations[$country_code] = $language_array += $CONFIG->translations[$country_code];
}
return true;