resolve piwik/piwik#6097, modify browser language reporting

1 files changed, 32 insertions, 0 deletions

diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index ad5deec648..4f2fa1b648 100644..100755
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -266,3 +266,35 @@ function languageTranslate($label)
 
     return $translation;
 }
+
+/**
+ * @param $label
+ * @return string
+ */
+function languageTranslateWithCode($label)
+{
+
+    $ex = explode('-', $label);
+
+    $lang = languageTranslate($ex[0]);
+
+    $countryKey = 'UserCountry_country_' . $ex[1];
+
+    $country = Piwik::translate($countryKey);
+
+    if ($country == $countryKey) {
+        $country = 'Unknown';
+    }
+
+    return $lang . ' - ' . $country . ' - (' . $label . ')';
+}
+
+/**
+ * @param $lang
+ * @return mixed
+ */
+function groupByLangCallback($lang)
+{
+    $ex = explode('-', $lang);
+    return $ex[0];
+}
\ No newline at end of file