[Pkg-owncloud-commits] [owncloud] 11/239: Update error messages

[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 368342a085cd33d6f6ea9fa037b9695c82571992
Author: Bart Visscher <bartv at thisnet.nl>
Date:   Fri Nov 15 14:46:00 2013 +0100

    Update error messages
---
 lib/private/util.php         | 2 +-
 settings/admin.php           | 2 +-
 settings/templates/admin.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/private/util.php b/lib/private/util.php
index d44ae09..115deac 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -355,7 +355,7 @@ class OC_Util {
 
 		if(!OC_Util::isSetLocaleWorking()) {
 			$errors[] = array(
-				'error' => 'Setting locale to en_US.UTF-8/en_US.UTF8 failed',
+				'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.'
 			);
 		}
diff --git a/settings/admin.php b/settings/admin.php
index 120f15b..0d3868a 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
-$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking());
+$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
 $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5413b70..66bcfa2 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -59,14 +59,14 @@ if (!$_['has_fileinfo']) {
 }
 
 // is locale working ?
-if (!$_['islocaleworking']) {
+if (!$_['isLocaleWorking']) {
 	?>
 <fieldset class="personalblock">
 	<h2><?php p($l->t('Locale not working'));?></h2>
 
 		<span class="connectionwarning">
 		<?php
-			$locales = 'en_US.UTF-8/en_US.UTF8';
+			$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)));
 			?>
 	</span>

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