Merge remote-tracking branch 'upstream/master'

lib/crowi/express-init.js

@@ -34,7 +34,7 @@ module.exports = function(crowi, app) {
       fallbackLng: [User.LANG_EN_US],
       whitelist: Object.keys(User.getLanguageLabels()).map((k) => User[k]),
       backend: {
-        loadPath: 'locales/{{lng}}/translation.json'
+        loadPath: crowi.localeDir + '{{lng}}/translation.json'
       },
       detection: {
         order: ['userSettingDetector', 'header', 'navigator'],

lib/views/layout/layout.html

@@ -11,6 +11,17 @@
 
   <meta name="viewport" content="width=device-width,initial-scale=1">
 
+  <meta name="apple-mobile-web-app-title" content="{{ config.crowi['app:title']|default('Crowi') }}">
+
+  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+  <link rel="apple-touch-icon"                 href="/apple-touch-icon.png">
+  <link rel="apple-touch-icon" sizes="72x72"   href="/apple-touch-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
+  <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
+  <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
+  <link rel="icon" type="image/png" href="/android-chrome-192x192.png" sizes="192x192">
+
   <link rel="stylesheet" href="/css/crowi{% if env  == 'production' %}.min{% endif %}.css">
 
   <script src="{{ assets('/js/bundled.js') }}"></script>