diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
| commit | 07b599a683760d2542014bb04a681463420a3565 (patch) | |
| tree | cfcd06671529eeec7790fb70a8d490094d7942c9 /js/lib/languages.js | |
| parent | ea0140d87534c3b10e489d13a1449ebb79da832d (diff) | |
| parent | 174763bcbcd20812dc09f27b64908f9d71b523b9 (diff) | |
| download | elgg-07b599a683760d2542014bb04a681463420a3565.tar.gz elgg-07b599a683760d2542014bb04a681463420a3565.tar.bz2 | |
Merge branch 'lorea-preprod'
Conflicts:
.gitmodules
Diffstat (limited to 'js/lib/languages.js')
| -rw-r--r-- | js/lib/languages.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/js/lib/languages.js b/js/lib/languages.js index 439df3e27..a8ba72c31 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -4,8 +4,6 @@ */ elgg.provide('elgg.config.translations'); -elgg.config.language = "<?php echo elgg_get_config('language'); ?>" || 'en'; - /** * Analagous to the php version. Merges translations for a * given language into the current translations map. @@ -94,4 +92,4 @@ elgg.config.translations.init = function() { elgg.reload_all_translations(); }; -elgg.register_hook_handler('boot', 'system', elgg.config.translations.init); +elgg.register_hook_handler('boot', 'system', elgg.config.translations.init);
\ No newline at end of file |