Merge branch 'origin/master'

framework/base/Theme.php

@@ -83,7 +83,7 @@ class Theme extends Component
         parent::init();
 
         if (empty($this->pathMap)) {
-            if (($basePath = $this->getBasePath()) == null) {
+            if (($basePath = $this->getBasePath()) === null) {
                 throw new InvalidConfigException('The "basePath" property must be set.');
             }
             $this->pathMap = [Yii::$app->getBasePath() => [$basePath]];

framework/messages/fr/yii.php

@@ -17,9 +17,36 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return array (
+  'Are you sure you want to delete this item?' => 'Êtes-vous sûr de vouloir supprimer cet élément ?',
+  'Only files with these MIME types are allowed: {mimeTypes}.' => 'Seulement les fichiers ayant ces types MIME sont autorisés : {mimeTypes}.',
+  'in {delta, plural, =1{a day} other{# days}}' => 'dans {delta, plural, =1{un jour} other{# jours}}',
+  'in {delta, plural, =1{a minute} other{# minutes}}' => 'dans {delta, plural, =1{une minute} other{# minutes}}',
+  'in {delta, plural, =1{a month} other{# months}}' => 'dans {delta, plural, =1{un mois} other{# mois}}',
+  'in {delta, plural, =1{a second} other{# seconds}}' => 'dans {delta, plural, =1{une seconde} other{# secondes}}',
+  'in {delta, plural, =1{a year} other{# years}}' => 'dans {delta, plural, =1{un an} other{# ans}}',
+  'in {delta, plural, =1{an hour} other{# hours}}' => 'dans {delta, plural, =1{une heure} other{# heures}}',
+  '{delta, plural, =1{a day} other{# days}} ago' => 'il y a {delta, plural, =1{un jour} other{# jours}}',
+  '{delta, plural, =1{a minute} other{# minutes}} ago' => 'il y a {delta, plural, =1{une minute} other{# minutes}}',
+  '{delta, plural, =1{a month} other{# months}} ago' => 'il y a {delta, plural, =1{un mois} other{# mois}}',
+  '{delta, plural, =1{a second} other{# seconds}} ago' => 'il y a {delta, plural, =1{une seconde} other{# secondes}}',
+  '{delta, plural, =1{a year} other{# years}} ago' => 'il y a {delta, plural, =1{un an} other{# ans}}',
+  '{delta, plural, =1{an hour} other{# hours}} ago' => 'il y a {delta, plural, =1{une heure} other{# heures}}',
+  '{n, plural, =1{# byte} other{# bytes}}' => '{n, plural, =1{# octet} other{# octets}}',
+  '{n, plural, =1{# gigabyte} other{# gigabytes}}' => '{n, plural, =1{# gigaoctet} other{# gigaoctets}}',
+  '{n, plural, =1{# kilobyte} other{# kilobytes}}' => '{n, plural, =1{# kilooctet} other{# kilooctets}}',
+  '{n, plural, =1{# megabyte} other{# megabytes}}' => '{n, plural, =1{# megaoctet} other{# megaoctets}}',
+  '{n, plural, =1{# petabyte} other{# petabytes}}' => '{n, plural, =1{# petaoctet} other{# petaoctets}}',
+  '{n, plural, =1{# terabyte} other{# terabytes}}' => '{n, plural, =1{# teraoctet} other{# teraoctets}}',
+  '{n} B' => '{n} o',
+  '{n} GB' => '{n} Go',
+  '{n} KB' => '{n} Ko',
+  '{n} MB' => '{n} Mo',
+  '{n} PB' => '{n} Po',
+  '{n} TB' => '{n} To',
+  'Are you sure to delete this item?' => '@@Voulez-vous vraiment supprimer cet élément ?@@',
+  'Only files with these mimeTypes are allowed: {mimeTypes}.' => '@@Les types MIME de fichier autorisés sont : {mimeTypes}.@@',
   '(not set)' => '(non défini)',
   'An internal server error occurred.' => 'Une erreur de serveur interne s\'est produite.',
-  'Are you sure to delete this item?' => 'Voulez-vous vraiment supprimer cet élément ?',
   'Delete' => 'Supprimer',
   'Error' => 'Erreur',
   'File upload failed.' => 'Le téléchargement du fichier a échoué.',
@@ -33,7 +60,6 @@ return array (
   'No help for unknown sub-command "{command}".' => 'Aucune aide pour la sous-commande inconnue « {command} ».',
   'No results found.' => 'Aucun résultat trouvé.',
   'Only files with these extensions are allowed: {extensions}.' => 'Les extensions de fichier autorisées sont : {extensions}.',
-  'Only files with these mimeTypes are allowed: {mimeTypes}.' => 'Les types MIME de fichier autorisés sont : {mimeTypes}.',
   'Page not found.' => 'Page non trouvée.',
   'Please fix the following errors:' => 'Veuillez vérifier les erreurs suivantes :',
   'Please upload a file.' => 'Veuillez télécharger un fichier.',