Merge branch 'master' into dev

# Conflicts:
#	var/Widget/Options.php

install.php

@@ -1366,7 +1366,7 @@ function install_step_3_perform()
                 'url' => 'https://typecho.org',
                 'ip' => '127.0.0.1',
                 'agent' => $options->generator,
-                'text' => '欢迎加入 Typecho 大家族',
+                'text' => _t('欢迎加入 Typecho 大家族'),
                 'type' => 'comment',
                 'status' => 'approved',
                 'parent' => 0

var/Widget/Options.php

@@ -169,6 +169,13 @@ class Options extends Base
                 $themeOptions = $this->tryDeserialize($options[$themeOptionsKey]);
                 $options = array_merge($options, $themeOptions);
             }
+        } elseif (function_exists('install_get_default_options')) {
+            $defaultOptions = install_get_default_options();
+            $initOptionKeys = ['routingTable', 'plugins', 'charset', 'contentType', 'timezone', 'installed', 'generator', 'siteUrl', 'lang', 'secret'];
+
+            foreach ($initOptionKeys as $option) {
+                $options[$option] = $defaultOptions[$option];
+            }
         }
 
         $this->push($options);