From da8351ec5c640bb4a48937a25fca81ad9f1bf3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Wed, 28 May 2014 16:10:41 -0400 Subject: [PATCH] Fix #208 and #209 --- check_setup.php | 4 ++-- common.php | 7 +++++-- locales/cs_CZ/translations.php | 2 +- locales/de_DE/translations.php | 2 +- locales/es_ES/translations.php | 2 +- locales/fr_FR/translations.php | 2 +- locales/it_IT/translations.php | 2 +- locales/pt_BR/translations.php | 2 +- locales/zh_CN/translations.php | 2 +- models/config.php | 2 +- models/database.php | 2 +- 11 files changed, 16 insertions(+), 13 deletions(-) diff --git a/check_setup.php b/check_setup.php index 3b90870..155ed7a 100644 --- a/check_setup.php +++ b/check_setup.php @@ -53,8 +53,8 @@ if (! function_exists('curl_init') && ! ini_get('allow_url_fopen')) { } // Check if /data is writeable -if (! is_writable('data')) { - die('The directory "data" must be writeable by your web server user'); +if (! is_writable(DATA_DIRECTORY)) { + die('The directory "'.DATA_DIRECTORY.'" must be writeable by your web server user'); } // Include password_compat for PHP < 5.5 diff --git a/common.php b/common.php index 509064a..c0ce756 100644 --- a/common.php +++ b/common.php @@ -1,6 +1,5 @@ 'Heslo je vyžadováno', 'The minimum length is 6 characters' => 'Minimální délka je 6 znaků', 'The confirmation is required' => 'Potvrzení je vyžadováno', - 'Passwords doesn\'t match' => 'Hesla se neshodují', + 'Passwords don\'t match' => 'Hesla se neshodují', 'Do you really want to remove these items from your history?' => 'Opravdu chcete odstranit tyto články z historie?', 'Do you really want to remove this subscription: "%s"?' => 'Opravdu chcete odstranit tento odběr: "%s"?', 'Nothing to read, do you want to update your subscriptions?' => diff --git a/locales/de_DE/translations.php b/locales/de_DE/translations.php index 0f2ed78..8d0585a 100644 --- a/locales/de_DE/translations.php +++ b/locales/de_DE/translations.php @@ -98,7 +98,7 @@ return array( 'The password is required' => 'Es wird ein Passwort benötigt.', 'The minimum length is 6 characters' => 'Die minimale Länge sind 6 Zeichen.', 'The confirmation is required' => 'Es ist eine Bestätigung notwendig.', - 'Passwords doesn\'t match' => 'Die Passwörter stimmen nicht überein', + 'Passwords don\'t match' => 'Die Passwörter stimmen nicht überein', 'Do you really want to remove these items from your history?' => 'Willst du sicher alle Einträge aus dem Verlauf löschen?', 'Do you really want to remove this subscription: "%s"?' => 'Willst du dieses Abonnement wirklich löschen: "%s" ?', 'Nothing to read, do you want to update your subscriptions?' => diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php index ef3f141..f09a1e5 100644 --- a/locales/es_ES/translations.php +++ b/locales/es_ES/translations.php @@ -184,7 +184,7 @@ return array( 'The password is required' => 'Se requiere contraseña', 'The minimum length is 6 characters' => 'La longitud mínima es de 6 caracteres', 'The confirmation is required' => 'Se requiere confirmación', - 'Passwords doesn\'t match' => 'Las contraseñas no coinciden', + 'Passwords don\'t match' => 'Las contraseñas no coinciden', 'Do you really want to remove these items from your history?' => '¿De verdad quiere borrar estos ítems del historial?', 'Do you really want to remove this subscription: "%s"?' => '¿De verdad quiere borrar esta suscripción: "%s"?', 'Nothing to read, do you want to update your subscriptions?' => diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php index 35df327..f15474a 100644 --- a/locales/fr_FR/translations.php +++ b/locales/fr_FR/translations.php @@ -187,7 +187,7 @@ return array( 'The password is required' => 'Le mot de passe est obligatoire', 'The minimum length is 6 characters' => 'La longueur minimale est de 6 caractères', 'The confirmation is required' => 'La confirmation est obligatoire', - 'Passwords doesn\'t match' => 'Les mots de passe ne sont pas identiques', + 'Passwords don\'t match' => 'Les mots de passe ne sont pas identiques', 'Do you really want to remove these items from your history?' => 'Voulez-vous vraiment supprimer les éléments de votre historique ?', 'Do you really want to remove this subscription: "%s"?' => 'Voulez-vous vraiment supprimer cet abonnement : « %s » ?', 'Nothing to read, do you want to update your subscriptions?' => diff --git a/locales/it_IT/translations.php b/locales/it_IT/translations.php index f664e11..6a2f477 100644 --- a/locales/it_IT/translations.php +++ b/locales/it_IT/translations.php @@ -99,7 +99,7 @@ return array( 'The password is required' => 'La password è obbligatoria.', 'The minimum length is 6 characters' => 'La lunghezza minima è di 6 caratteri.', 'The confirmation is required' => 'La conferma è obbligatoria.', - 'Passwords doesn\'t match' => 'Le password non coincidono', + 'Passwords don\'t match' => 'Le password non coincidono', 'Do you really want to remove these items from your history?' => 'Vuoi veramente cancellare questi articoli dalla cronologia?', 'Do you really want to remove this subscription: "%s"?' => 'Vuoi veramente cancellare la sottoscrizione a: "%s" ?', 'Nothing to read, do you want to update your subscriptions?' => diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php index 740ee69..00e10a9 100644 --- a/locales/pt_BR/translations.php +++ b/locales/pt_BR/translations.php @@ -99,7 +99,7 @@ return array( 'The password is required' => 'É Necessário senha.', 'The minimum length is 6 characters' => 'O comprimento mínimo é de 6 caracteres', 'The confirmation is required' => 'A confirmação é necessária.', - 'Passwords doesn\'t match' => 'Senha não corresponde.', + 'Passwords don\'t match' => 'Senha não corresponde.', 'Do you really want to remove these items from your history?' => 'Você realmente deseja remover esses itens de sua histórico?', 'Do you really want to remove this subscription: "%s"?' => 'Você realmente deseja remover essa assinatura: "%s" ?', 'Nothing to read, do you want to update your subscriptions?' => diff --git a/locales/zh_CN/translations.php b/locales/zh_CN/translations.php index 0984aae..442cda1 100644 --- a/locales/zh_CN/translations.php +++ b/locales/zh_CN/translations.php @@ -98,7 +98,7 @@ return array( 'The password is required' => '密码必填', 'The minimum length is 6 characters' => '最小长度是 6 个字符', 'The confirmation is required' => '确认密码必填', - 'Passwords doesn\'t match' => '两次输入密码不一致', + 'Passwords don\'t match' => '两次输入密码不一致', 'Do you really want to remove these items from your history?' => '你确认要移除这些历史记录吗？', 'Do you really want to remove this subscription: "%s"?' => '你确定要移除这个订阅源: "%s" ？', 'Nothing to read, do you want to update your subscriptions?' => diff --git a/models/config.php b/models/config.php index 0ecd111..c100ece 100644 --- a/models/config.php +++ b/models/config.php @@ -261,7 +261,7 @@ function validate_modification(array $values) $rules[] = new Validators\Required('password', t('The password is required')); $rules[] = new Validators\MinLength('password', t('The minimum length is 6 characters'), 6); $rules[] = new Validators\Required('confirmation', t('The confirmation is required')); - $rules[] = new Validators\Equals('password', 'confirmation', t('Passwords doesn\'t match')); + $rules[] = new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')); } $v = new Validator($values, $rules); diff --git a/models/database.php b/models/database.php index 2497387..cddbad9 100644 --- a/models/database.php +++ b/models/database.php @@ -97,7 +97,7 @@ function validate(array $values) new Validators\Required('password', t('The password is required')), new Validators\MinLength('password', t('The minimum length is 6 characters'), 6), new Validators\Required('confirmation', t('The confirmation is required')), - new Validators\Equals('password', 'confirmation', t('Passwords doesn\'t match')), + new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')), )); return array(