Merge pull request picocms#546 from asdfuser/master

Add option to set a locale
alsyundawy · Jun 14, 2020 · 60f27df · 60f27df
2 parents 1aca13e + b2df860
commit 60f27df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/config/config.yml.template b/config/config.yml.template
@@ -7,6 +7,7 @@ base_url: ~                         # Pico will try to guess its base URL, if th
 rewrite_url: ~                      # A boolean (true or false) indicating whether URL rewriting is forced
 debug: ~                            # Set this to true to enable Pico's debug mode
 timezone: ~                         # Your PHP installation might require you to manually specify a timezone
+locale: ~                           # Your PHP installation might require you to manually specify a locale to use
 
 ##
 # Theme

diff --git a/lib/Pico.php b/lib/Pico.php
@@ -936,6 +936,7 @@ protected function loadConfig()
             'rewrite_url' => null,
             'debug' => null,
             'timezone' => null,
+            'locale' => null,
             'theme' => 'default',
             'theme_config' => null,
             'theme_meta' => null,
@@ -974,6 +975,10 @@ protected function loadConfig()
         }
         date_default_timezone_set($this->config['timezone']);
 
+        if ($this->config['locale'] !== null) {
+            setlocale(LC_ALL, $this->config['locale']);
+        }
+
         if (!$this->config['plugins_url']) {
             $this->config['plugins_url'] = $this->getUrlFromPath($this->getPluginsDir());
         } else {