feedback

1 files changed, 9 insertions, 12 deletions

diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index 7372532b54..5af0c8d9f6 100755
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -276,23 +276,20 @@ function languageTranslateWithCode($label)
     $ex = explode('-', $label);
     $lang = languageTranslate($ex[0]);
 
-    if (count($ex) == 2)
-    {
+    if (count($ex) == 2 && $ex[0] != $ex[1]) {
         $countryKey = 'UserCountry_country_' . $ex[1];
-    }
-    else
-    {
-        $countryKey = 'UserCountry_country_' . $label;
-        $label = $label . '-' . $label;
-    }
+        $country = Piwik::translate($countryKey);
 
-    $country = Piwik::translate($countryKey);
+        if ($country == $countryKey) {
+            return sprintf("%s (%s)", $lang, $ex[0]);
+        }
 
-    if ($country == $countryKey) {
-        $country = Piwik::translate('General_Unknown');
+        return sprintf("%s - %s (%s)", $lang, $country, $label);
+
+    } else {
+        return sprintf("%s (%s)", $lang, $ex[0]);
     }
 
-    return sprintf("%s - %s - (%s)", $lang, $country, $label);
 }
 
 /**