Default lang to en_US

diff --git a/galette/lib/Galette/Core/I18n.php b/galette/lib/Galette/Core/I18n.php
index ab4054e4e882d729a03e3a9a63e29ac460e4b13e..171c2609ac5d99f0b95652d9d7b3c104ce88eb2d 100644 (file)
--- a/galette/lib/Galette/Core/I18n.php
+++ b/galette/lib/Galette/Core/I18n.php
@@ -58,7 +58,7 @@ class I18n
     private $name;
     private $abbrev;
 
-    public const DEFAULT_LANG = 'fr_FR';
+    public const DEFAULT_LANG = 'en_US';
 
     private $dir = 'lang/';
     private $path;

diff --git a/tests/Galette/Core/tests/units/I18n.php b/tests/Galette/Core/tests/units/I18n.php
index 7dec768e6a33753eb745c278d679afa24948813a..039a3e34d8804270b79b9282832aa169d67a7b69 100644 (file)
--- a/tests/Galette/Core/tests/units/I18n.php
+++ b/tests/Galette/Core/tests/units/I18n.php
@@ -94,8 +94,7 @@ class I18n extends atoum
     {
         $this->i18n = new \Galette\Core\I18n();
 
-        $this->variable($this->i18n->getID())
-            ->isIdenticalTo('fr_FR');
+        $this->variable($this->i18n->getID())->isIdenticalTo(\Galette\Core\I18n::DEFAULT_LANG);
 
         //simulate fr from browser
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr_BE';
@@ -108,15 +107,14 @@ class I18n extends atoum
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en_GB';
         $this->i18n = new \Galette\Core\I18n();
 
-        $this->variable($this->i18n->getID())
-            ->isIdenticalTo('en_US');
+        $this->variable($this->i18n->getID())->isIdenticalTo('en_US');
 
         //simulate unknown lang from browser
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'un_KN';
         $this->i18n = new \Galette\Core\I18n();
 
         $this->variable($this->i18n->getID())
-            ->isIdenticalTo('fr_FR');
+            ->isIdenticalTo(\Galette\Core\I18n::DEFAULT_LANG);
     }
 
     /**
@@ -158,9 +156,10 @@ class I18n extends atoum
     public function testGetNameFromid()
     {
         $lang = $this->i18n->getNameFromId('en_US');
+        $this->variable($lang)->isIdenticalTo('English');
 
-        $this->variable($lang)
-            ->isIdenticalTo('English');
+        $lang = $this->i18n->getNameFromId('fr_FR');
+        $this->variable($lang)->isIdenticalTo('Français');
     }
 
     /**
@@ -175,14 +174,21 @@ class I18n extends atoum
         $name = $this->i18n->getName();
         $abbrev = $this->i18n->getAbbrev();
 
-        $this->variable($id)
-            ->isIdenticalTo('fr_FR');
-        $this->variable($longid)
-            ->isIdenticalTo('fr_FR.utf8');
-        $this->variable($name)
-            ->isIdenticalTo('Français');
-        $this->variable($abbrev)
-            ->isIdenticalTo('fr');
+        $this->variable($id)->isIdenticalTo('en_US');
+        $this->variable($longid)->isIdenticalTo('en_US');
+        $this->variable($name)->isIdenticalTo('English');
+        $this->variable($abbrev)->isIdenticalTo('en');
+
+        $this->i18n->changeLanguage('fr_FR');
+        $id = $this->i18n->getID();
+        $longid = $this->i18n->getLongID();
+        $name = $this->i18n->getName();
+        $abbrev = $this->i18n->getAbbrev();
+
+        $this->variable($id)->isIdenticalTo('fr_FR');
+        $this->variable($longid)->isIdenticalTo('fr_FR.utf8');
+        $this->variable($name)->isIdenticalTo('Français');
+        $this->variable($abbrev)->isIdenticalTo('fr');
     }
 
     /**
@@ -195,8 +201,7 @@ class I18n extends atoum
         $this->i18n->changeLanguage('un_KN');
         $id = $this->i18n->getID();
 
-        $this->variable($id)
-            ->isIdenticalTo('fr_FR');
+        $this->variable($id)->isIdenticalTo(\Galette\Core\I18n::DEFAULT_LANG);
     }
 
     /**

diff --git a/tests/Galette/IO/tests/units/News.php b/tests/Galette/IO/tests/units/News.php
index a690add68e715133bf87c573f168d4afc0fea594..37079649dcb60a626fef7ca673747ac491e91a83 100644 (file)
--- a/tests/Galette/IO/tests/units/News.php
+++ b/tests/Galette/IO/tests/units/News.php
@@ -93,7 +93,7 @@ class News extends atoum
     public function testCacheNews()
     {
         //will use default lang to build RSS URL
-        $file = GALETTE_CACHE_DIR . md5('https://galette.eu/site/fr/feed.xml') . '.cache';
+        $file = GALETTE_CACHE_DIR . md5('https://galette.eu/site/feed.xml') . '.cache';
 
         //ensure file does not exists
         $this->boolean(file_exists($file))->isFalse;