Fixing the warning notifications

diff --git a/lib/private/util.php b/lib/private/util.php
index 115deaceb5614440ce26105513c62fa60a7b19d2..695d641b5b10819ed156c4f89d5c18dde631cbdc 100755 (executable)
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -356,7 +356,7 @@ class OC_Util {
                if(!OC_Util::isSetLocaleWorking()) {
                        $errors[] = array(
                                'error' => 'Setting locale to en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8 failed',
-                               'hint' => 'Please install the locale on your system and restart your webserver.'
+                               'hint' => 'Please install one of theses locales on your system and restart your webserver.'
                        );
                }
 

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 66bcfa21c3f66f88dbf09acc784819ef33417e33..f655a14be87d04424bb27b512d5442abf2cc5df9 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -67,7 +67,15 @@ if (!$_['isLocaleWorking']) {
                <span class="connectionwarning">
                <?php
                        $locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8';
-                       p($l->t('System locale can\'t be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.', array($locales, $locales)));
+                       p($l->t('System locale can not be set to a one which supports UTF-8.'));
+                       ?>
+               <br>
+               <?php
+                       p($l->t('This means that there might be problems with certain characters in file names.'));
+               ?>
+                       <br>
+                       <?php
+                       p($l->t('We strongly suggest to install the required packages on your system to support one of the following locales: %s.', array($locales)));
                        ?>
        </span>