diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-09-10 07:52:21 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-09-10 07:52:21 +0400 |
| commit | d1c056d97ef67df503fdf779d400e7748bf4dda6 (patch) | |
| tree | 28b98e22922f1f5e3a36e82f6d401298dd034c39 /plugins/UserSettings | |
| parent | 2c79c318b952495635db141a0645a31a3c0bd2b0 (diff) | |
| parent | 770d1afc6c097dba72e8d1370e0b0e303575cfb5 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
core/Tracker.php
Diffstat (limited to 'plugins/UserSettings')
| -rw-r--r-- | plugins/UserSettings/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index 28215d2e44..06fcae389e 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -265,13 +265,13 @@ function languageTranslate($label) return Piwik_Translate('General_Unknown'); } - $key = 'UserLanguage_Language_' . $label; + $key = 'UserSettings_Language_' . $label; $translation = Piwik_Translate($key); // Show language code if unknown code if ($translation == $key) { - $translation = Piwik_Translate('TranslationsAdmin_LanguageCode') . ' ' . $label; + $translation = Piwik_Translate('UserSettings_LanguageCode') . ' ' . $label; } return $translation; |