Fix #208 and #209

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')) {
+if (! is_writable(DATA_DIRECTORY)) {
-    die('The directory "data" must be writeable by your web server user');
+    die('The directory "'.DATA_DIRECTORY.'" must be writeable by your web server user');
 }
 
 // Include password_compat for PHP < 5.5

common.php

@@ -1,6 +1,5 @@
 <?php
 
-require __DIR__.'/check_setup.php';
 require __DIR__.'/lib/Translator.php';
 require __DIR__.'/vendor/PicoDb/Database.php';
 require __DIR__.'/vendor/PicoFeed/PicoFeed.php';
@@ -25,7 +24,9 @@ require __DIR__.'/models/auto_update.php';
 require __DIR__.'/models/database.php';
 require __DIR__.'/models/remember_me.php';
 
-if (file_exists('config.php')) require 'config.php';
+if (file_exists('config.php')) {
+    require 'config.php';
+}
 
 defined('APP_VERSION') or define('APP_VERSION', 'master');
 defined('HTTP_TIMEOUT') or define('HTTP_TIMEOUT', 20);
@@ -53,6 +54,8 @@ defined('AUTO_UPDATE_DOWNLOAD_DIRECTORY') or define('AUTO_UPDATE_DOWNLOAD_DIRECT
 defined('AUTO_UPDATE_ARCHIVE_DIRECTORY') or define('AUTO_UPDATE_ARCHIVE_DIRECTORY', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'archive');
 defined('AUTO_UPDATE_BACKUP_DIRECTORY') or define('AUTO_UPDATE_BACKUP_DIRECTORY', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'backup');
 
+require __DIR__.'/check_setup.php';
+
 PicoDb\Database::bootstrap('db', function() {
 
     $db = new PicoDb\Database(array(

locales/cs_CZ/translations.php

@@ -102,7 +102,7 @@ return array(
     'The password is required' => '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 <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>' =>

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 <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>' =>

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 <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>' =>

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 <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>' =>

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 <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>' =>

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 <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>' =>

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 <a href="?action=refresh-all" data-action="refresh-all">update your subscriptions?</a>' =>

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);

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(