i18n: Store user culture in session

loblao · lyoshenka · commit e0b3d0921afd · 2016-09-20T10:11:00.000-04:00
diff --git a/controller/Session.class.php b/controller/Session.class.php
@@ -6,7 +6,8 @@ class Session
         KEY_DOWNLOAD_ALLOWED = 'beta_download_allowed2',
         KEY_PREFINERY_USER_ID = 'prefinery_user_id',
         KEY_PREFINER_USED_CUSTOM_CODE = 'prefinery_used_custom_code',
-        KEY_LIST_SUB_ERROR = 'list_error';
+        KEY_LIST_SUB_ERROR = 'list_error',
+        KEY_USER_CULTURE = 'user_culture';
 
   public static function init()
   {
diff --git a/lib/i18n.class.php b/lib/i18n.class.php
@@ -17,6 +17,11 @@ class i18n
 
   public static function register($culture = null) /*needed to trigger class include, presumably setup would happen here*/
   {
+    if ($culture == null)
+    {
+      $culture = Session::get(Session::KEY_USER_CULTURE);
+    }
+
     if ($culture === null)
     {
       $urlTokens = Request::getHost() ? explode('.', Request::getHost()) : [];
diff --git a/web/index.php b/web/index.php
@@ -25,8 +25,8 @@
 
 try
 {
-  i18n::register();
   Session::init();
+  i18n::register();
   if (!IS_PRODUCTION)
   {
     View::compileCss();

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ class Session`
`6`	`6`	`KEY_DOWNLOAD_ALLOWED = 'beta_download_allowed2',`
`7`	`7`	`KEY_PREFINERY_USER_ID = 'prefinery_user_id',`
`8`	`8`	`KEY_PREFINER_USED_CUSTOM_CODE = 'prefinery_used_custom_code',`
`9`		`- KEY_LIST_SUB_ERROR = 'list_error';`
	`9`	`+ KEY_LIST_SUB_ERROR = 'list_error',`
	`10`	`+ KEY_USER_CULTURE = 'user_culture';`
`10`	`11`
`11`	`12`	`public static function init()`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,11 @@ class i18n`
`17`	`17`
`18`	`18`	`public static function register($culture = null) /needed to trigger class include, presumably setup would happen here/`
`19`	`19`	`{`
	`20`	`+ if ($culture == null)`
	`21`	`+ {`
	`22`	`+ $culture = Session::get(Session::KEY_USER_CULTURE);`
	`23`	`+ }`
	`24`	`+`
`20`	`25`	`if ($culture === null)`
`21`	`26`	`{`
`22`	`27`	`$urlTokens = Request::getHost() ? explode('.', Request::getHost()) : [];`