Browse Source

Changed language folder names

Visman 6 years ago
parent
commit
fa3174ed4c
93 changed files with 9 additions and 9 deletions
  1. 2 2
      app/Core/Lang.php
  2. 6 6
      app/Models/User/Model.php
  3. 1 1
      app/config/install.php
  4. 0 0
      app/lang/en/admin.po
  5. 0 0
      app/lang/en/admin_categories.po
  6. 0 0
      app/lang/en/admin_censoring.po
  7. 0 0
      app/lang/en/admin_forums.po
  8. 0 0
      app/lang/en/admin_groups.po
  9. 0 0
      app/lang/en/admin_host.po
  10. 0 0
      app/lang/en/admin_index.po
  11. 0 0
      app/lang/en/admin_maintenance.po
  12. 0 0
      app/lang/en/admin_options.po
  13. 0 0
      app/lang/en/admin_permissions.po
  14. 0 0
      app/lang/en/admin_users.po
  15. 0 0
      app/lang/en/auth.po
  16. 0 0
      app/lang/en/common.po
  17. 0 0
      app/lang/en/delete.po
  18. 0 0
      app/lang/en/forum.po
  19. 0 0
      app/lang/en/index.po
  20. 0 0
      app/lang/en/install.po
  21. 0 0
      app/lang/en/mail/activate_email.tpl
  22. 0 0
      app/lang/en/mail/banned_email_change.tpl
  23. 0 0
      app/lang/en/mail/banned_email_post.tpl
  24. 0 0
      app/lang/en/mail/banned_email_register.tpl
  25. 0 0
      app/lang/en/mail/dupe_email_change.tpl
  26. 0 0
      app/lang/en/mail/dupe_email_register.tpl
  27. 0 0
      app/lang/en/mail/form_email.tpl
  28. 0 0
      app/lang/en/mail/form_pmsn.tpl
  29. 0 0
      app/lang/en/mail/new_reply.tpl
  30. 0 0
      app/lang/en/mail/new_reply_full.tpl
  31. 0 0
      app/lang/en/mail/new_report.tpl
  32. 0 0
      app/lang/en/mail/new_topic.tpl
  33. 0 0
      app/lang/en/mail/new_topic_full.tpl
  34. 0 0
      app/lang/en/mail/new_user.tpl
  35. 0 0
      app/lang/en/mail/passphrase_reset.tpl
  36. 0 0
      app/lang/en/mail/rename.tpl
  37. 0 0
      app/lang/en/mail/welcome.tpl
  38. 0 0
      app/lang/en/misc.po
  39. 0 0
      app/lang/en/name.php
  40. 0 0
      app/lang/en/post.po
  41. 0 0
      app/lang/en/profile.po
  42. 0 0
      app/lang/en/profile_other.po
  43. 0 0
      app/lang/en/register.po
  44. 0 0
      app/lang/en/search.po
  45. 0 0
      app/lang/en/stopwords.txt
  46. 0 0
      app/lang/en/subforums.po
  47. 0 0
      app/lang/en/topic.po
  48. 0 0
      app/lang/en/userlist.po
  49. 0 0
      app/lang/ru/admin.po
  50. 0 0
      app/lang/ru/admin_categories.po
  51. 0 0
      app/lang/ru/admin_censoring.po
  52. 0 0
      app/lang/ru/admin_forums.po
  53. 0 0
      app/lang/ru/admin_groups.po
  54. 0 0
      app/lang/ru/admin_host.po
  55. 0 0
      app/lang/ru/admin_index.po
  56. 0 0
      app/lang/ru/admin_maintenance.po
  57. 0 0
      app/lang/ru/admin_options.po
  58. 0 0
      app/lang/ru/admin_permissions.po
  59. 0 0
      app/lang/ru/admin_users.po
  60. 0 0
      app/lang/ru/auth.po
  61. 0 0
      app/lang/ru/common.po
  62. 0 0
      app/lang/ru/delete.po
  63. 0 0
      app/lang/ru/forum.po
  64. 0 0
      app/lang/ru/index.po
  65. 0 0
      app/lang/ru/install.po
  66. 0 0
      app/lang/ru/mail/activate_email.tpl
  67. 0 0
      app/lang/ru/mail/banned_email_change.tpl
  68. 0 0
      app/lang/ru/mail/banned_email_post.tpl
  69. 0 0
      app/lang/ru/mail/banned_email_register.tpl
  70. 0 0
      app/lang/ru/mail/dupe_email_change.tpl
  71. 0 0
      app/lang/ru/mail/dupe_email_register.tpl
  72. 0 0
      app/lang/ru/mail/form_email.tpl
  73. 0 0
      app/lang/ru/mail/form_pmsn.tpl
  74. 0 0
      app/lang/ru/mail/new_reply.tpl
  75. 0 0
      app/lang/ru/mail/new_reply_full.tpl
  76. 0 0
      app/lang/ru/mail/new_report.tpl
  77. 0 0
      app/lang/ru/mail/new_topic.tpl
  78. 0 0
      app/lang/ru/mail/new_topic_full.tpl
  79. 0 0
      app/lang/ru/mail/new_user.tpl
  80. 0 0
      app/lang/ru/mail/passphrase_reset.tpl
  81. 0 0
      app/lang/ru/mail/rename.tpl
  82. 0 0
      app/lang/ru/mail/welcome.tpl
  83. 0 0
      app/lang/ru/misc.po
  84. 0 0
      app/lang/ru/name.php
  85. 0 0
      app/lang/ru/post.po
  86. 0 0
      app/lang/ru/profile.po
  87. 0 0
      app/lang/ru/profile_other.po
  88. 0 0
      app/lang/ru/register.po
  89. 0 0
      app/lang/ru/search.po
  90. 0 0
      app/lang/ru/stopwords.txt
  91. 0 0
      app/lang/ru/subforums.po
  92. 0 0
      app/lang/ru/topic.po
  93. 0 0
      app/lang/ru/userlist.po

+ 2 - 2
app/Core/Lang.php

@@ -87,10 +87,10 @@ class Lang
                     $this->tr[$lang] = $this->arrayFromStr($file);
                     $this->tr[$lang] = $this->arrayFromStr($file);
                 }
                 }
                 $flag = false;
                 $flag = false;
-            } elseif ($lang === 'English') {
+            } elseif ($lang === 'en') {
                 $flag = false;
                 $flag = false;
             }
             }
-            $lang = 'English';
+            $lang = 'en';
         } while ($flag);
         } while ($flag);
 
 
         $this->loaded[$name][$lang] = true;
         $this->loaded[$name][$lang] = true;

+ 6 - 6
app/Models/User/Model.php

@@ -111,14 +111,14 @@ class Model extends DataModel
     {
     {
         $langs = $this->c->Func->getLangs();
         $langs = $this->c->Func->getLangs();
 
 
-        $lang = $this->isGuest || empty($this->a['language']) || ! \in_array($this->a['language'], $langs)
+        $lang = $this->isGuest || empty($this->a['language']) || ! isset($langs[$this->a['language']])
             ? $this->c->config->o_default_lang
             ? $this->c->config->o_default_lang
             : $this->a['language'];
             : $this->a['language'];
 
 
-        if (\in_array($lang, $langs)) {
+        if (isset($langs[$lang])) {
             return $lang;
             return $lang;
         } else {
         } else {
-            return isset($langs[0]) ? $langs[0] : 'English';
+            return \reset($langs) ?: 'en';
         }
         }
     }
     }
 
 
@@ -131,14 +131,14 @@ class Model extends DataModel
     {
     {
         $styles = $this->c->Func->getStyles();
         $styles = $this->c->Func->getStyles();
 
 
-        $style = $this->isGuest || empty($this->a['style']) || ! \in_array($this->a['style'], $styles)
+        $style = $this->isGuest || empty($this->a['style']) || ! isset($styles[$this->a['style']])
             ? $this->c->config->o_default_style
             ? $this->c->config->o_default_style
             : $this->a['style'];
             : $this->a['style'];
 
 
-        if (\in_array($style, $styles)) {
+        if (isset($styles[$style])) {
             return $style;
             return $style;
         } else {
         } else {
-            return isset($styles[0]) ? $styles[0] : 'ForkBB';
+            return \reset($styles) ?: 'ForkBB';
         }
         }
     }
     }
 
 

+ 1 - 1
app/config/install.php

@@ -15,7 +15,7 @@ return [
     ],
     ],
 
 
     'forConfig' => [
     'forConfig' => [
-        'o_default_lang'   => 'English',
+        'o_default_lang'   => 'en',
         'o_default_style'  => 'ForkBB',
         'o_default_style'  => 'ForkBB',
         'o_redirect_delay' => 0,
         'o_redirect_delay' => 0,
         'o_date_format'    => 'Y-m-d',
         'o_date_format'    => 'Y-m-d',

+ 0 - 0
app/lang/English/admin.po → app/lang/en/admin.po


+ 0 - 0
app/lang/English/admin_categories.po → app/lang/en/admin_categories.po


+ 0 - 0
app/lang/English/admin_censoring.po → app/lang/en/admin_censoring.po


+ 0 - 0
app/lang/English/admin_forums.po → app/lang/en/admin_forums.po


+ 0 - 0
app/lang/English/admin_groups.po → app/lang/en/admin_groups.po


+ 0 - 0
app/lang/English/admin_host.po → app/lang/en/admin_host.po


+ 0 - 0
app/lang/English/admin_index.po → app/lang/en/admin_index.po


+ 0 - 0
app/lang/English/admin_maintenance.po → app/lang/en/admin_maintenance.po


+ 0 - 0
app/lang/English/admin_options.po → app/lang/en/admin_options.po


+ 0 - 0
app/lang/English/admin_permissions.po → app/lang/en/admin_permissions.po


+ 0 - 0
app/lang/English/admin_users.po → app/lang/en/admin_users.po


+ 0 - 0
app/lang/English/auth.po → app/lang/en/auth.po


+ 0 - 0
app/lang/English/common.po → app/lang/en/common.po


+ 0 - 0
app/lang/English/delete.po → app/lang/en/delete.po


+ 0 - 0
app/lang/English/forum.po → app/lang/en/forum.po


+ 0 - 0
app/lang/English/index.po → app/lang/en/index.po


+ 0 - 0
app/lang/English/install.po → app/lang/en/install.po


+ 0 - 0
app/lang/English/mail/activate_email.tpl → app/lang/en/mail/activate_email.tpl


+ 0 - 0
app/lang/English/mail/banned_email_change.tpl → app/lang/en/mail/banned_email_change.tpl


+ 0 - 0
app/lang/English/mail/banned_email_post.tpl → app/lang/en/mail/banned_email_post.tpl


+ 0 - 0
app/lang/English/mail/banned_email_register.tpl → app/lang/en/mail/banned_email_register.tpl


+ 0 - 0
app/lang/English/mail/dupe_email_change.tpl → app/lang/en/mail/dupe_email_change.tpl


+ 0 - 0
app/lang/English/mail/dupe_email_register.tpl → app/lang/en/mail/dupe_email_register.tpl


+ 0 - 0
app/lang/English/mail/form_email.tpl → app/lang/en/mail/form_email.tpl


+ 0 - 0
app/lang/English/mail/form_pmsn.tpl → app/lang/en/mail/form_pmsn.tpl


+ 0 - 0
app/lang/English/mail/new_reply.tpl → app/lang/en/mail/new_reply.tpl


+ 0 - 0
app/lang/English/mail/new_reply_full.tpl → app/lang/en/mail/new_reply_full.tpl


+ 0 - 0
app/lang/English/mail/new_report.tpl → app/lang/en/mail/new_report.tpl


+ 0 - 0
app/lang/English/mail/new_topic.tpl → app/lang/en/mail/new_topic.tpl


+ 0 - 0
app/lang/English/mail/new_topic_full.tpl → app/lang/en/mail/new_topic_full.tpl


+ 0 - 0
app/lang/English/mail/new_user.tpl → app/lang/en/mail/new_user.tpl


+ 0 - 0
app/lang/English/mail/passphrase_reset.tpl → app/lang/en/mail/passphrase_reset.tpl


+ 0 - 0
app/lang/English/mail/rename.tpl → app/lang/en/mail/rename.tpl


+ 0 - 0
app/lang/English/mail/welcome.tpl → app/lang/en/mail/welcome.tpl


+ 0 - 0
app/lang/English/misc.po → app/lang/en/misc.po


+ 0 - 0
app/lang/English/name.php → app/lang/en/name.php


+ 0 - 0
app/lang/English/post.po → app/lang/en/post.po


+ 0 - 0
app/lang/English/profile.po → app/lang/en/profile.po


+ 0 - 0
app/lang/English/profile_other.po → app/lang/en/profile_other.po


+ 0 - 0
app/lang/English/register.po → app/lang/en/register.po


+ 0 - 0
app/lang/English/search.po → app/lang/en/search.po


+ 0 - 0
app/lang/English/stopwords.txt → app/lang/en/stopwords.txt


+ 0 - 0
app/lang/English/subforums.po → app/lang/en/subforums.po


+ 0 - 0
app/lang/English/topic.po → app/lang/en/topic.po


+ 0 - 0
app/lang/English/userlist.po → app/lang/en/userlist.po


+ 0 - 0
app/lang/Russian/admin.po → app/lang/ru/admin.po


+ 0 - 0
app/lang/Russian/admin_categories.po → app/lang/ru/admin_categories.po


+ 0 - 0
app/lang/Russian/admin_censoring.po → app/lang/ru/admin_censoring.po


+ 0 - 0
app/lang/Russian/admin_forums.po → app/lang/ru/admin_forums.po


+ 0 - 0
app/lang/Russian/admin_groups.po → app/lang/ru/admin_groups.po


+ 0 - 0
app/lang/Russian/admin_host.po → app/lang/ru/admin_host.po


+ 0 - 0
app/lang/Russian/admin_index.po → app/lang/ru/admin_index.po


+ 0 - 0
app/lang/Russian/admin_maintenance.po → app/lang/ru/admin_maintenance.po


+ 0 - 0
app/lang/Russian/admin_options.po → app/lang/ru/admin_options.po


+ 0 - 0
app/lang/Russian/admin_permissions.po → app/lang/ru/admin_permissions.po


+ 0 - 0
app/lang/Russian/admin_users.po → app/lang/ru/admin_users.po


+ 0 - 0
app/lang/Russian/auth.po → app/lang/ru/auth.po


+ 0 - 0
app/lang/Russian/common.po → app/lang/ru/common.po


+ 0 - 0
app/lang/Russian/delete.po → app/lang/ru/delete.po


+ 0 - 0
app/lang/Russian/forum.po → app/lang/ru/forum.po


+ 0 - 0
app/lang/Russian/index.po → app/lang/ru/index.po


+ 0 - 0
app/lang/Russian/install.po → app/lang/ru/install.po


+ 0 - 0
app/lang/Russian/mail/activate_email.tpl → app/lang/ru/mail/activate_email.tpl


+ 0 - 0
app/lang/Russian/mail/banned_email_change.tpl → app/lang/ru/mail/banned_email_change.tpl


+ 0 - 0
app/lang/Russian/mail/banned_email_post.tpl → app/lang/ru/mail/banned_email_post.tpl


+ 0 - 0
app/lang/Russian/mail/banned_email_register.tpl → app/lang/ru/mail/banned_email_register.tpl


+ 0 - 0
app/lang/Russian/mail/dupe_email_change.tpl → app/lang/ru/mail/dupe_email_change.tpl


+ 0 - 0
app/lang/Russian/mail/dupe_email_register.tpl → app/lang/ru/mail/dupe_email_register.tpl


+ 0 - 0
app/lang/Russian/mail/form_email.tpl → app/lang/ru/mail/form_email.tpl


+ 0 - 0
app/lang/Russian/mail/form_pmsn.tpl → app/lang/ru/mail/form_pmsn.tpl


+ 0 - 0
app/lang/Russian/mail/new_reply.tpl → app/lang/ru/mail/new_reply.tpl


+ 0 - 0
app/lang/Russian/mail/new_reply_full.tpl → app/lang/ru/mail/new_reply_full.tpl


+ 0 - 0
app/lang/Russian/mail/new_report.tpl → app/lang/ru/mail/new_report.tpl


+ 0 - 0
app/lang/Russian/mail/new_topic.tpl → app/lang/ru/mail/new_topic.tpl


+ 0 - 0
app/lang/Russian/mail/new_topic_full.tpl → app/lang/ru/mail/new_topic_full.tpl


+ 0 - 0
app/lang/Russian/mail/new_user.tpl → app/lang/ru/mail/new_user.tpl


+ 0 - 0
app/lang/Russian/mail/passphrase_reset.tpl → app/lang/ru/mail/passphrase_reset.tpl


+ 0 - 0
app/lang/Russian/mail/rename.tpl → app/lang/ru/mail/rename.tpl


+ 0 - 0
app/lang/Russian/mail/welcome.tpl → app/lang/ru/mail/welcome.tpl


+ 0 - 0
app/lang/Russian/misc.po → app/lang/ru/misc.po


+ 0 - 0
app/lang/Russian/name.php → app/lang/ru/name.php


+ 0 - 0
app/lang/Russian/post.po → app/lang/ru/post.po


+ 0 - 0
app/lang/Russian/profile.po → app/lang/ru/profile.po


+ 0 - 0
app/lang/Russian/profile_other.po → app/lang/ru/profile_other.po


+ 0 - 0
app/lang/Russian/register.po → app/lang/ru/register.po


+ 0 - 0
app/lang/Russian/search.po → app/lang/ru/search.po


+ 0 - 0
app/lang/Russian/stopwords.txt → app/lang/ru/stopwords.txt


+ 0 - 0
app/lang/Russian/subforums.po → app/lang/ru/subforums.po


+ 0 - 0
app/lang/Russian/topic.po → app/lang/ru/topic.po


+ 0 - 0
app/lang/Russian/userlist.po → app/lang/ru/userlist.po