From ff88e2f322fcbbddf62fc46a95d16de6e69624fa Mon Sep 17 00:00:00 2001 From: "Matt (IPv4) Cowley" Date: Fri, 11 Dec 2020 16:54:12 +0000 Subject: [PATCH] Allow language selection (#191) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add dropdown for language * Use vue-i18n to translate strings * Tweak header styling * Add Chinese languages in * Typo * Get language from browser (#193) * adaptive system language * Modify the adaptive system language * Remove dead code * Delete lang default values * Move browser language detection to util * Remove todos * Fix global PHP dropdown Co-authored-by: 墨娘 <61287199+moniang@users.noreply.github.com> --- package-lock.json | 5 ++ package.json | 1 + src/nginxconfig/i18n/default.js | 27 ++++++ src/nginxconfig/i18n/en/common.js | 2 +- src/nginxconfig/i18n/en/templates/app.js | 3 + .../domain_sections/reverse_proxy.js | 1 - .../en/templates/domain_sections/routing.js | 1 - .../en/templates/domain_sections/server.js | 3 +- src/nginxconfig/i18n/index.js | 9 +- src/nginxconfig/i18n/zh-cn/common.js | 2 +- src/nginxconfig/i18n/zh-cn/templates/app.js | 3 + .../domain_sections/reverse_proxy.js | 1 - .../templates/domain_sections/routing.js | 1 - .../zh-cn/templates/domain_sections/server.js | 3 +- src/nginxconfig/i18n/zh-tw/common.js | 2 +- src/nginxconfig/i18n/zh-tw/templates/app.js | 3 + .../domain_sections/reverse_proxy.js | 1 - .../templates/domain_sections/routing.js | 1 - .../zh-tw/templates/domain_sections/server.js | 3 +- src/nginxconfig/mount.js | 13 ++- src/nginxconfig/scss/_header.scss | 47 ++++++++++ src/nginxconfig/scss/_vue-select.scss | 26 +++++- src/nginxconfig/scss/style.scss | 1 + src/nginxconfig/templates/app.vue | 86 ++++++++++++++++--- src/nginxconfig/templates/domain.vue | 8 +- .../templates/domain_sections/https.vue | 36 ++++---- .../templates/domain_sections/logging.vue | 16 ++-- .../templates/domain_sections/php.vue | 36 ++++---- .../templates/domain_sections/presets.vue | 28 +++--- .../templates/domain_sections/python.vue | 24 ++---- .../templates/domain_sections/restrict.vue | 34 ++++---- .../domain_sections/reverse_proxy.vue | 22 ++--- .../templates/domain_sections/routing.vue | 20 ++--- .../templates/domain_sections/server.vue | 26 +++--- src/nginxconfig/templates/footer.vue | 28 +++--- src/nginxconfig/templates/global.vue | 8 +- .../templates/global_sections/docker.vue | 18 ++-- .../templates/global_sections/https.vue | 54 ++++++------ .../templates/global_sections/logging.vue | 30 +++---- .../templates/global_sections/nginx.vue | 12 +-- .../templates/global_sections/performance.vue | 24 ++---- .../templates/global_sections/php.vue | 54 ++++++------ .../templates/global_sections/python.vue | 14 +-- .../global_sections/reverse_proxy.vue | 14 ++- .../templates/global_sections/security.vue | 16 ++-- .../templates/global_sections/tools.vue | 54 ++++++------ src/nginxconfig/templates/setup.vue | 12 ++- .../templates/setup_sections/certbot.vue | 22 ++--- .../templates/setup_sections/download.vue | 26 +++--- .../templates/setup_sections/go_live.vue | 12 +-- .../templates/setup_sections/ssl.vue | 14 +-- src/nginxconfig/util/browser_language.js | 59 +++++++++++++ src/nginxconfig/util/import_data.js | 7 +- 53 files changed, 539 insertions(+), 434 deletions(-) create mode 100644 src/nginxconfig/i18n/default.js create mode 100644 src/nginxconfig/scss/_header.scss create mode 100644 src/nginxconfig/util/browser_language.js diff --git a/package-lock.json b/package-lock.json index bef4d4e..ceb7684 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12560,6 +12560,11 @@ "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", "dev": true }, + "vue-i18n": { + "version": "8.22.2", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.2.tgz", + "integrity": "sha512-rb569fVJInPUgS/bbCxEQ9DrAoFTntuJvYoK4Fpk2VfNbA09WzdTKk57ppjz3S+ps9hW+p9H+2ASgMvojedkow==" + }, "vue-loader": { "version": "15.9.3", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz", diff --git a/package.json b/package.json index 0a4944f..7ad28dd 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "simple-js-sha2-256": "^1.0.7", "string-similarity": "^4.0.2", "vue": "^2.6.12", + "vue-i18n": "^8.22.2", "vue-select": "^3.10.8" }, "devDependencies": { diff --git a/src/nginxconfig/i18n/default.js b/src/nginxconfig/i18n/default.js new file mode 100644 index 0000000..adaee9f --- /dev/null +++ b/src/nginxconfig/i18n/default.js @@ -0,0 +1,27 @@ +/* +Copyright 2020 DigitalOcean + +This code is licensed under the MIT License. +You may obtain a copy of the License at +https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/ + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions : + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +export default 'en'; diff --git a/src/nginxconfig/i18n/en/common.js b/src/nginxconfig/i18n/en/common.js index 768b637..22d0a74 100644 --- a/src/nginxconfig/i18n/en/common.js +++ b/src/nginxconfig/i18n/en/common.js @@ -46,5 +46,5 @@ export default { reverseProxy: 'Reverse proxy', reverseProxyLower: 'reverse proxy', restrict: 'Restrict', - listen: 'listen', + path: 'Path', }; diff --git a/src/nginxconfig/i18n/en/templates/app.js b/src/nginxconfig/i18n/en/templates/app.js index f170c89..6853806 100644 --- a/src/nginxconfig/i18n/en/templates/app.js +++ b/src/nginxconfig/i18n/en/templates/app.js @@ -29,6 +29,9 @@ import common from '../common'; export default { title: `${common.nginx}Config`, description: `The easiest way to configure a performant, secure, and stable ${common.nginx} server.`, + en: 'English', + zhCN: 'Chinese (simplified)', + zhTW: 'Chinese (traditional)', singleColumnMode: 'Single column mode', splitColumnMode: 'Split column mode', perWebsiteConfig: 'Per-website config', diff --git a/src/nginxconfig/i18n/en/templates/domain_sections/reverse_proxy.js b/src/nginxconfig/i18n/en/templates/domain_sections/reverse_proxy.js index 5a7ed97..d3e8748 100644 --- a/src/nginxconfig/i18n/en/templates/domain_sections/reverse_proxy.js +++ b/src/nginxconfig/i18n/en/templates/domain_sections/reverse_proxy.js @@ -31,5 +31,4 @@ export default { reverseProxyCannotBeEnabledWithPhp: `${common.reverseProxy} cannot be enabled whilst ${common.php} is enabled.`, reverseProxyCannotBeEnabledWithPython: `${common.reverseProxy} cannot be enabled whilst ${common.python} is enabled.`, enableReverseProxy: `${common.enable} ${common.reverseProxyLower}`, - path: 'Path', }; diff --git a/src/nginxconfig/i18n/en/templates/domain_sections/routing.js b/src/nginxconfig/i18n/en/templates/domain_sections/routing.js index 0b70d1a..e3bbc81 100644 --- a/src/nginxconfig/i18n/en/templates/domain_sections/routing.js +++ b/src/nginxconfig/i18n/en/templates/domain_sections/routing.js @@ -31,6 +31,5 @@ export default { fallbackRoutingPhpPath: `Fallback routing ${common.php} path`, legacyPhpRouting: `Legacy ${common.php} routing`, enableLegacyRouting: `${common.enable} legacy routing`, - path: 'Path', routing: 'Routing', }; diff --git a/src/nginxconfig/i18n/en/templates/domain_sections/server.js b/src/nginxconfig/i18n/en/templates/domain_sections/server.js index 443220e..df0715c 100644 --- a/src/nginxconfig/i18n/en/templates/domain_sections/server.js +++ b/src/nginxconfig/i18n/en/templates/domain_sections/server.js @@ -26,13 +26,12 @@ THE SOFTWARE. export default { domain: 'Domain', - path: 'Path', documentRoot: 'Document root', oneOrMoreOtherDomainsAreAlsoNamed: 'One or more other domains are also named', thisWillCauseIssuesWithConfigGeneration: 'This will cause issues with config generation.', wwwSubdomain: 'www subdomain', cdnSubdomain: 'CDN subdomain', redirectSubdomains: 'Redirect subdomains', - routing: 'Routing', server: 'Server', + listen: 'listen', }; diff --git a/src/nginxconfig/i18n/index.js b/src/nginxconfig/i18n/index.js index d4293f7..3be4ec5 100644 --- a/src/nginxconfig/i18n/index.js +++ b/src/nginxconfig/i18n/index.js @@ -24,9 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import en from './en'; - -const lang = 'en'; -const packs = { en }; - -export default packs[lang]; +export { default as en } from './en'; +export { default as zhCN } from './zh-cn'; +export { default as zhTW } from './zh-tw'; diff --git a/src/nginxconfig/i18n/zh-cn/common.js b/src/nginxconfig/i18n/zh-cn/common.js index 0e47352..5e305b2 100644 --- a/src/nginxconfig/i18n/zh-cn/common.js +++ b/src/nginxconfig/i18n/zh-cn/common.js @@ -46,5 +46,5 @@ export default { reverseProxy: '反向代理', reverseProxyLower: '反向代理', restrict: '限制', - listen: '监听', + path: '路径', }; diff --git a/src/nginxconfig/i18n/zh-cn/templates/app.js b/src/nginxconfig/i18n/zh-cn/templates/app.js index 7c382f0..ddf2d7b 100644 --- a/src/nginxconfig/i18n/zh-cn/templates/app.js +++ b/src/nginxconfig/i18n/zh-cn/templates/app.js @@ -29,6 +29,9 @@ import common from '../common'; export default { title: `${common.nginx} 配置`, description: `配置高性能、安全、稳定的${common.nginx}服务器的最简单方法。`, + en: '英语', + zhCN: '简体中文', + zhTW: '繁体中文', singleColumnMode: '垂直模式', splitColumnMode: '水平模式', perWebsiteConfig: '站点配置', diff --git a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/reverse_proxy.js b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/reverse_proxy.js index 9247201..e43313f 100644 --- a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/reverse_proxy.js +++ b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/reverse_proxy.js @@ -31,5 +31,4 @@ export default { reverseProxyCannotBeEnabledWithPhp: `${common.reverseProxy}在启用${common.php}时无法启用。`, reverseProxyCannotBeEnabledWithPython: `${common.reverseProxy}在启用${common.python}时无法启用。`, enableReverseProxy: `${common.enable} ${common.reverseProxyLower}`, - path: '路径', }; diff --git a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/routing.js b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/routing.js index 83a779e..026926c 100644 --- a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/routing.js +++ b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/routing.js @@ -31,6 +31,5 @@ export default { fallbackRoutingPhpPath: `后备路由${common.php}路径`, legacyPhpRouting: `传统${common.php}路由`, enableLegacyRouting: `${common.enable}传统路由`, - path: '路径', routing: '路由设置', }; diff --git a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/server.js b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/server.js index b214422..e275e49 100644 --- a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/server.js +++ b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/server.js @@ -26,13 +26,12 @@ THE SOFTWARE. export default { domain: '站点', - path: '路径', documentRoot: '运行目录', oneOrMoreOtherDomainsAreAlsoNamed: '发现了重复的域名', thisWillCauseIssuesWithConfigGeneration: '这将导致生成配置出现问题。', wwwSubdomain: 'www 子域名', cdnSubdomain: 'CDN 子域名', redirectSubdomains: '子域名重定向', - routing: '路由设置', server: '服务', + listen: '监听', }; diff --git a/src/nginxconfig/i18n/zh-tw/common.js b/src/nginxconfig/i18n/zh-tw/common.js index 22b9682..000cd56 100644 --- a/src/nginxconfig/i18n/zh-tw/common.js +++ b/src/nginxconfig/i18n/zh-tw/common.js @@ -46,5 +46,5 @@ export default { reverseProxy: '反向代理', reverseProxyLower: '反向代理', restrict: '限制', - listen: '監聽', + path: '路徑', }; diff --git a/src/nginxconfig/i18n/zh-tw/templates/app.js b/src/nginxconfig/i18n/zh-tw/templates/app.js index 6989ca5..e931f9f 100644 --- a/src/nginxconfig/i18n/zh-tw/templates/app.js +++ b/src/nginxconfig/i18n/zh-tw/templates/app.js @@ -29,6 +29,9 @@ import common from '../common'; export default { title: `${common.nginx} 配寘`, description: `配寘高性能、安全、穩定的${common.nginx}服務器的最簡單方法。`, + en: '英語', + zhCN: '簡體中文', + zhTW: '繁體中文', singleColumnMode: '垂直模式', splitColumnMode: '水准模式', perWebsiteConfig: '網站配寘', diff --git a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/reverse_proxy.js b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/reverse_proxy.js index 47ba7f2..5fe6dd3 100644 --- a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/reverse_proxy.js +++ b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/reverse_proxy.js @@ -31,5 +31,4 @@ export default { reverseProxyCannotBeEnabledWithPhp: `${common.reverseProxy}在啟用${common.php}時無法啟用。`, reverseProxyCannotBeEnabledWithPython: `${common.reverseProxy}在啟用${common.python}時無法啟用。`, enableReverseProxy: `${common.enable} ${common.reverseProxyLower}`, - path: '路徑', }; diff --git a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/routing.js b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/routing.js index bc48ed5..1f31792 100644 --- a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/routing.js +++ b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/routing.js @@ -31,6 +31,5 @@ export default { fallbackRoutingPhpPath: `後備路由${common.php}路徑`, legacyPhpRouting: `傳統${common.php}路由`, enableLegacyRouting: `${common.enable}傳統路由`, - path: '路徑', routing: '路由設定', }; diff --git a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/server.js b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/server.js index c467d1e..61d28b4 100644 --- a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/server.js +++ b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/server.js @@ -26,13 +26,12 @@ THE SOFTWARE. export default { domain: '網站', - path: '路徑', documentRoot: '運行目錄', oneOrMoreOtherDomainsAreAlsoNamed: '發現了重復的域名', thisWillCauseIssuesWithConfigGeneration: '這將導致生成配置出現問題。', wwwSubdomain: 'www 子域名', cdnSubdomain: 'CDN 子域名', redirectSubdomains: '子域名重定向', - routing: '路由設定', server: '服務', + listen: '監聽', }; diff --git a/src/nginxconfig/mount.js b/src/nginxconfig/mount.js index 647a137..9522006 100644 --- a/src/nginxconfig/mount.js +++ b/src/nginxconfig/mount.js @@ -26,12 +26,21 @@ THE SOFTWARE. import './scss/style.scss'; import Vue from 'vue'; +import VueI18n from 'vue-i18n'; import './util/prism_bundle'; import App from './templates/app'; -import i18n from './i18n'; +import * as i18nPacks from './i18n'; +import i18nDefault from './i18n/default'; -document.head.title = i18n.templates.app.title; +Vue.use(VueI18n); + +const i18n = new VueI18n({ + locale: i18nDefault, + fallbackLocale: i18nDefault, + messages: i18nPacks, +}); new Vue({ + i18n, render: h => h(App), }).$mount('#app'); diff --git a/src/nginxconfig/scss/_header.scss b/src/nginxconfig/scss/_header.scss new file mode 100644 index 0000000..e74c456 --- /dev/null +++ b/src/nginxconfig/scss/_header.scss @@ -0,0 +1,47 @@ +/* +Copyright 2020 DigitalOcean + +This code is licensed under the MIT License. +You may obtain a copy of the License at +https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/ + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions : + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +.header { + padding: ($margin * 2) $margin ($margin * 1.5); + + @media (min-width: $breakpoint) { + padding: ($margin * 3.75) 0 ($margin * .5); + } + + .container { + form { + .input-container { + margin: 0; + } + + .buttons { + > * { + margin: 0 0 1rem; + } + } + } + } +} diff --git a/src/nginxconfig/scss/_vue-select.scss b/src/nginxconfig/scss/_vue-select.scss index cbe51e2..b17574c 100644 --- a/src/nginxconfig/scss/_vue-select.scss +++ b/src/nginxconfig/scss/_vue-select.scss @@ -36,8 +36,15 @@ THE SOFTWARE. box-shadow: 0 0 2px rgba($success, .5); .vs__selected { + height: $height; + position: unset; top: .75em; } + + .vs__search { + position: absolute; + width: 100%; + } } } @@ -60,6 +67,17 @@ THE SOFTWARE. margin: 0; padding: 0; transition: opacity $transition; + + .has-icon { + align-items: center; + display: flex; + + .icon { + color: $dark-grey; + font-size: 1.25rem; + margin: 0 .5rem 0 0; + } + } } .vs__search { @@ -76,7 +94,13 @@ THE SOFTWARE. } .vs__actions { - padding: 0; + padding: 0 0 0 .25rem; + } + } + + .vs__dropdown-menu { + .vs__dropdown-option { + white-space: normal; } } } diff --git a/src/nginxconfig/scss/style.scss b/src/nginxconfig/scss/style.scss index daa6c46..8ab4c8d 100644 --- a/src/nginxconfig/scss/style.scss +++ b/src/nginxconfig/scss/style.scss @@ -41,6 +41,7 @@ $highlight: #f2c94c; $vs-state-active-bg: $primary; @import "~vue-select/src/scss/vue-select"; + @import "header"; @import "tabs"; @import "panel"; @import "fields"; diff --git a/src/nginxconfig/templates/app.vue b/src/nginxconfig/templates/app.vue index 177114d..f0383a6 100644 --- a/src/nginxconfig/templates/app.vue +++ b/src/nginxconfig/templates/app.vue @@ -26,18 +26,30 @@ THE SOFTWARE. -

{{ i18n.templates.app.globalConfig }}

+

{{ $t('templates.app.globalConfig') }}

-

{{ i18n.templates.app.setup }}

+

{{ $t('templates.app.setup') }}

-

{{ i18n.templates.app.configFiles }}

+

{{ $t('templates.app.configFiles') }}

diff --git a/src/nginxconfig/templates/domain_sections/php.vue b/src/nginxconfig/templates/domain_sections/php.vue index 2403956..458a3a0 100644 --- a/src/nginxconfig/templates/domain_sections/php.vue +++ b/src/nginxconfig/templates/domain_sections/php.vue @@ -28,18 +28,18 @@ THE SOFTWARE.
- +
@@ -49,7 +49,7 @@ THE SOFTWARE.
- +
@@ -57,7 +57,7 @@ THE SOFTWARE.
- {{ i18n.templates.domainSections.php.enablePhp }} + {{ $t('templates.domainSections.php.enablePhp') }}
@@ -67,7 +67,7 @@ THE SOFTWARE.
- +
@@ -75,7 +75,7 @@ THE SOFTWARE.
- {{ i18n.templates.domainSections.php.enableWordPressRules }} + {{ $t('templates.domainSections.php.enableWordPressRules') }}
@@ -85,7 +85,7 @@ THE SOFTWARE.
- +
@@ -93,7 +93,7 @@ THE SOFTWARE.
- {{ i18n.templates.domainSections.php.enableDrupalRules }} + {{ $t('templates.domainSections.php.enableDrupalRules') }}
@@ -103,7 +103,7 @@ THE SOFTWARE.
- +
@@ -111,7 +111,7 @@ THE SOFTWARE.
- {{ i18n.templates.domainSections.php.enableMagentoRules }} + {{ $t('templates.domainSections.php.enableMagentoRules') }}
@@ -121,7 +121,7 @@ THE SOFTWARE.
- +
@@ -129,7 +129,7 @@ THE SOFTWARE.
- {{ i18n.templates.domainSections.php.enableJoomlaRules }} + {{ $t('templates.domainSections.php.enableJoomlaRules') }}
@@ -141,7 +141,6 @@ THE SOFTWARE. diff --git a/src/nginxconfig/templates/global.vue b/src/nginxconfig/templates/global.vue index 9d5d96b..b9b0f17 100644 --- a/src/nginxconfig/templates/global.vue +++ b/src/nginxconfig/templates/global.vue @@ -29,7 +29,7 @@ THE SOFTWARE.
@@ -44,17 +44,16 @@ THE SOFTWARE.
- {{ i18n.common.back }} + {{ $t('common.back') }} - {{ i18n.common.next }} + {{ $t('common.next') }}
diff --git a/src/nginxconfig/templates/global_sections/php.vue b/src/nginxconfig/templates/global_sections/php.vue index 30ab2f7..68a5e9a 100644 --- a/src/nginxconfig/templates/global_sections/php.vue +++ b/src/nginxconfig/templates/global_sections/php.vue @@ -28,13 +28,13 @@ THE SOFTWARE.
- +
@@ -44,7 +44,7 @@ THE SOFTWARE. diff --git a/src/nginxconfig/templates/setup_sections/ssl.vue b/src/nginxconfig/templates/setup_sections/ssl.vue index 4948759..b5946d5 100644 --- a/src/nginxconfig/templates/setup_sections/ssl.vue +++ b/src/nginxconfig/templates/setup_sections/ssl.vue @@ -29,7 +29,7 @@ THE SOFTWARE.

  1. - +

    - +

@@ -64,12 +64,11 @@ THE SOFTWARE.