summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-11-21 14:44:25 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2013-11-21 14:44:25 +0100
commitcd1cf58875ffacf427420d6dbe94d8718e4075e0 (patch)
tree81a749c599fbd6d676967be4aa606736c1e51514
parent368342a085cd33d6f6ea9fa037b9695c82571992 (diff)
downloadnextcloud-server-cd1cf58875ffacf427420d6dbe94d8718e4075e0.tar.gz
nextcloud-server-cd1cf58875ffacf427420d6dbe94d8718e4075e0.zip
Fixing the warning notifications
-rwxr-xr-xlib/private/util.php2
-rw-r--r--settings/templates/admin.php10
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 115deaceb56..695d641b5b1 100755
--- 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 66bcfa21c3f..f655a14be87 100644
--- 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>