[Pkg-owncloud-commits] [owncloud] 40/239: Fixing the warning notifications

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit cd1cf58875ffacf427420d6dbe94d8718e4075e0
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Nov 21 14:44:25 2013 +0100

    Fixing the warning notifications
---
 lib/private/util.php         |  2 +-
 settings/templates/admin.php | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/private/util.php b/lib/private/util.php
index 115deac..695d641 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 66bcfa2..f655a14 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>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git