Move i18n strings to be centralised

src/nginxconfig/i18n/en/common.js

@@ -15,6 +15,19 @@ limitations under the License.
 */
 
 export default {
-    back: 'Back',
-    next: 'Next',
+	back: 'Back',
+	next: 'Next',
+	enable: 'enable',
+	php: 'PHP',
+	ssl: 'SSL',
+	nginx: 'NGINX',
+	http: 'HTTP',
+	https: 'HTTPS',
+	letsEncrypt: 'Let\'s Encrypt',
+	python: 'Python',
+	wordPress: 'WordPress',
+	drupal: 'Drupal',
+	magento: 'Magento',
+	django: 'Django',
+	logging: 'Logging',
 };

src/nginxconfig/i18n/en/index.js

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from './common';
 import templates from './templates';
 
-// TODO: centralised shared strings
-
-export default { templates };
+export default { common, templates };

src/nginxconfig/i18n/en/templates/app.js

@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../common';
+
 export default {
-    title: 'NGINXConfig',
-    description: 'The easiest way to configure a performant, secure, and stable NGINX server.',
+    title: `${common.nginx}Config`,
+    description: `The easiest way to configure a performant, secure, and stable ${common.nginx} server.`,
     singleColumnMode: 'Single column mode',
     splitColumnMode: 'Split column mode',
     perWebsiteConfig: 'Per-website config',

src/nginxconfig/i18n/en/templates/domain_sections/https.js

@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    https: 'HTTPS',
-    enableEncryptedSslConnection: 'enable encrypted SSL connections',
-    http2: 'HTTP/2',
-    enableHttp2Connections: 'enable HTTP/2 connections',
-    forceHttps: 'Force HTTPS',
+    enableEncryptedSslConnection: `${common.enable} encrypted ${common.ssl} connections`,
+    http2: `${common.http}/2`,
+    enableHttp2Connections: `${common.enable} ${common.http}/2 connections`,
+    forceHttps: `Force ${common.https}`,
     hsts: 'HSTS',
-    enableStrictTransportSecurity: 'enable Strict Transport Security',
+    enableStrictTransportSecurity: `${common.enable} Strict Transport Security`,
     certificationType: 'Certification type',
-    letsEncrypt: 'Let\'s Encrypt',
     customCertificate: 'Custom certificate',
-    letsEncryptEmail: 'Let\'s Encrypt email',
+    letsEncryptEmail: `${common.letsEncrypt} email`,
 };

src/nginxconfig/i18n/en/templates/domain_sections/logging.js

@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
     byDomain: 'by domain',
-    enableForThisDomain: 'enable for this domain',
-    logging: 'Logging',
+    enableForThisDomain: `${common.enable} for this domain`,
 };

src/nginxconfig/i18n/en/templates/domain_sections/php.js

@@ -14,16 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    php: 'PHP',
-    phpIsDisabled: 'PHP is disabled.',
-    phpCannotBeEnabledWithReverseProxy: 'PHP cannot be enabled whilst the reverse proxy is enabled.',
-    phpCannotBeEnabledWithPython: 'PHP cannot be enabled whilst Python is enabled.',
-    enablePhp: 'enable PHP',
-    wordPressRules: 'WordPress rules',
-    enableWordPressRules: 'enable WordPress-specific rules',
-    drupalRules: 'Drupal rules',
-    enableDrupalRules: 'enable Drupal-specific rules',
-    magentoRules: 'Magento rules',
-    enableMagentoRules: 'enable Magento-specific rules',
+    phpIsDisabled: `${common.php} is disabled.`,
+    phpCannotBeEnabledWithReverseProxy: `${common.php} cannot be enabled whilst the reverse proxy is enabled.`,
+    phpCannotBeEnabledWithPython: `${common.php} cannot be enabled whilst ${common.python} is enabled.`,
+    enablePhp: `${common.enable} ${common.php}`,
+    wordPressRules: `${common.wordPress} rules`,
+    enableWordPressRules: `${common.enable} ${common.wordPress}-specific rules`,
+    drupalRules: `${common.drupal} rules`,
+    enableDrupalRules: `${common.enable} ${common.drupal}-specific rules`,
+    magentoRules: `${common.magento} rules`,
+    enableMagentoRules: `${common.enable} ${common.magento}-specific rules`,
 };

src/nginxconfig/i18n/en/templates/domain_sections/presets.js

@@ -18,11 +18,6 @@ export default {
     presets: 'Presets',
     itLooksLikeYouCustomisedTheConfig: 'It looks like you\'ve customised the configuration for this domain. Choosing a new preset may reset or change some of the settings that you\'ve customised.',
     frontend: 'Frontend',
-    php: 'PHP',
-    django: 'Django',
     nodeJs: 'Node.js',
     singlePageApplication: 'Single-page application',
-    wordPress: 'WordPress',
-    drupal: 'Drupal',
-    magento: 'Magento',
 };

src/nginxconfig/i18n/en/templates/domain_sections/python.js

@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    python: 'Python',
-    pythonIsDisabled: 'Python is disabled.',
-    pythonCannotBeEnabledWithReverseProxy: 'Python cannot be enabled whilst the reverse proxy is enabled.',
-    pythonCannotBeEnabledWithPhp: 'Python cannot be enabled whilst PHP is enabled.',
-    enablePython: 'enable Python',
-    djangoRules: 'Django rules',
-    enableDjangoRules: 'enable Django-specific rules',
+    pythonIsDisabled: `${common.python} is disabled.`,
+    pythonCannotBeEnabledWithReverseProxy: `${common.python} cannot be enabled whilst the reverse proxy is enabled.`,
+    pythonCannotBeEnabledWithPhp: `${common.python} cannot be enabled whilst ${common.php} is enabled.`,
+    enablePython: `${common.enable} ${common.python}`,
+    djangoRules: `${common.django} rules`,
+    enableDjangoRules: `${common.enable} ${common.django}-specific rules`,
 };

src/nginxconfig/i18n/en/templates/domain_sections/reverse_proxy.js

@@ -14,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
     reverseProxy: 'Reverse proxy',
     reverseProxyIsDisabled: 'Reverse proxy is disabled.',
-    reverseProxyCannotBeEnabledWithPhp: 'Reverse proxy cannot be enabled whilst PHP is enabled.',
-    reverseProxyCannotBeEnabledWithPython: 'Reverse proxy cannot be enabled whilst Python is enabled.',
-    enableReverseProxy: 'enable reverse proxy',
+    reverseProxyCannotBeEnabledWithPhp: `Reverse proxy cannot be enabled whilst ${common.php} is enabled.`,
+    reverseProxyCannotBeEnabledWithPython: `Reverse proxy cannot be enabled whilst ${common.python} is enabled.`,
+    enableReverseProxy: `${common.enable} reverse proxy`,
     path: 'Path',
 };

src/nginxconfig/i18n/en/templates/domain_sections/routing.js

@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    enable: 'enable',
     fallbackRouting: 'Fallback routing',
-    fallbackRoutingPhpPath: 'Fallback routing PHP path',
-    legacyPhpRouting: 'Legacy PHP routing',
-    enableLegacyRouting: 'enable legacy routing',
+    fallbackRoutingPhpPath: `Fallback routing ${common.php} path`,
+    legacyPhpRouting: `Legacy ${common.php} routing`,
+    enableLegacyRouting: `${common.enable} legacy routing`,
     path: 'Path',
     routing: 'Routing',
 };

src/nginxconfig/i18n/en/templates/global.js

@@ -1,20 +0,0 @@
-/*
-Copyright 2020 DigitalOcean
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-export default {
-    back: 'Back',
-    next: 'Next',
-};

src/nginxconfig/i18n/en/templates/global_sections/https.js

@@ -14,16 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
+const mozilla = 'Mozilla';
+
 export default {
-    sslProfile: 'SSL Profile',
-    httpsMustBeEnabledOnOneSite: 'HTTPS must be enabled on at least one site to configure global HTTPS settings.',
+    sslProfile: `${common.ssl} Profile`,
+    httpsMustBeEnabledOnOneSite: `${common.https} must be enabled on at least one site to configure global ${common.https} settings.`,
     ocspDnsResolvers: 'OCSP DNS Resolvers',
     cloudflareResolver: 'Cloudflare Resolver',
     googlePublicDns: 'Google Public DNS',
     openDns: 'OpenDNS',
-    letsEncryptWebroot: 'Let\'s Encrypt webroot',
-    mozillaModern: 'Mozilla Modern',
-    mozillaIntermediate: 'Mozilla Intermediate',
-    mozillaOld: 'Mozilla Old',
-    https: 'HTTPS',
+    letsEncryptWebroot: `${common.letsEncrypt} webroot`,
+    mozillaModern: `${mozilla} Modern`,
+    mozillaIntermediate: `${mozilla} Intermediate`,
+    mozillaOld: `${mozilla} Old`,
 };

src/nginxconfig/i18n/en/templates/global_sections/logging.js

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    enableFileNotFoundErrorLogging: 'enable file not found error logging in',
-    logging: 'Logging',
+    enableFileNotFoundErrorLogging: `${common.enable} file not found error logging in`,
 };

src/nginxconfig/i18n/en/templates/global_sections/nginx.js

@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    nginxConfigDirectory: 'NGINX config directory',
+    nginxConfigDirectory: `${common.nginx} config directory`,
     mb: 'MB',
-    nginx: 'NGINX',
 };

src/nginxconfig/i18n/en/templates/global_sections/performance.js

@@ -14,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
     gzipCompression: 'Gzip compression',
-    enableGzipCompression: 'enable gzip compression',
+    enableGzipCompression: `${common.enable} gzip compression`,
     brotliCompression: 'Brotli compression',
-    enableBrotliCompression: 'enable brotli compression',
+    enableBrotliCompression: `${common.enable} brotli compression`,
     expirationForAssets: 'Expiration for assets',
     expirationForMedia: 'Expiration for media',
     expirationForSvgs: 'Expiration for SVGs',

src/nginxconfig/i18n/en/templates/global_sections/php.js

@@ -14,10 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    phpServer: 'PHP server',
-    phpMustBeEnabledOnOneSite: 'PHP must be enabled on at least one site to configure global PHP settings.',
-    phpBackupServer: 'PHP backup server',
+    phpServer: `${common.php} server`,
+    phpMustBeEnabledOnOneSite: `${common.php} must be enabled on at least one site to configure global ${common.php} settings.`,
+    phpBackupServer: `${common.php} backup server`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM socket',
     php5Socket: '5.x socket',
@@ -26,5 +28,4 @@ export default {
     php72Socket: '7.2 socket',
     php73Socket: '7.3 socket',
     disabled: 'Disabled',
-    php: 'PHP',
 };

src/nginxconfig/i18n/en/templates/global_sections/python.js

@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
-    pythonServer: 'Python server',
-    pythonMustBeEnabledOnOneSite: 'Python must be enabled on at least one site to configure global Python settings.',
-    python: 'Python',
+    pythonServer: `${common.python} server`,
+    pythonMustBeEnabledOnOneSite: `${common.python} must be enabled on at least one site to configure global ${common.python} settings.`,
 };

src/nginxconfig/i18n/en/templates/global_sections/security.js

@@ -15,6 +15,5 @@ limitations under the License.
 */
 
 export default {
-    enable: 'enable',
     security: 'Security',
 };

src/nginxconfig/i18n/en/templates/global_sections/tools.js

@@ -14,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
     modularizedStructure: 'Modularized structure',
-    enableModularizedConfigFiles: 'enable modularized config files',
+    enableModularizedConfigFiles: `${common.enable} modularized config files`,
     symlinkVhost: 'Symlink vhost',
-    enableSymLinksFrom: 'enable symlinks from',
+    enableSymLinksFrom: `${common.enable} symlinks from`,
     to: 'to',
     shareConfiguration: 'Share configuration',
     resetConfiguration: 'Reset configuration',

src/nginxconfig/i18n/en/templates/index.js

@@ -15,11 +15,9 @@ limitations under the License.
 */
 
 import app from './app';
-import domain from './domain';
-import global from './global';
 import setup from './setup';
 import domainSections from './domain_sections';
 import globalSections from './global_sections';
 import setupSections from './setup_sections';
 
-export default { app, domain, global, setup, domainSections, globalSections, setupSections };
+export default { app, setup, domainSections, globalSections, setupSections };

src/nginxconfig/i18n/en/templates/setup.js

@@ -15,8 +15,6 @@ limitations under the License.
 */
 
 export default {
-    back: 'Back',
-    next: 'Next',
     downloadConfig: 'Download Config',
     copyBase64: 'Copy Base64',
 };

src/nginxconfig/i18n/en/templates/setup_sections/certbot.js

@@ -14,12 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
+const certbot = 'Certbot';
+
 export default {
-    commentOutSslDirectivesInConfiguration: 'Comment out SSL related directives in the configuration:',
-    reloadYourNginxServer: 'Reload your NGINX server:',
-    obtainSslCertificatesFromLetsEncrypt: 'Obtain SSL certificates from Let\'s Encrypt using Certbot:',
-    uncommentSslDirectivesInConfiguration: 'Uncomment SSL related directives in the configuration:',
-    configureCertbotToReloadNginxOnCertificateRenewal: 'Configure Certbot to reload NGINX when it successfully renews certificates:',
-    certbotDoesNotNeedToBeSetupForYourConfiguration: 'Certbot does not need to be set up for your NGINX configuration.',
-    certbot: 'Certbot',
+    commentOutSslDirectivesInConfiguration: `Comment out ${common.ssl} related directives in the configuration:`,
+    reloadYourNginxServer: `Reload your ${common.nginx} server:`,
+    obtainSslCertificatesFromLetsEncrypt: `Obtain ${common.ssl} certificates from ${common.letsEncrypt} using ${certbot}:`,
+    uncommentSslDirectivesInConfiguration: `Uncomment ${common.ssl} related directives in the configuration:`,
+    configureCertbotToReloadNginxOnCertificateRenewal: `Configure ${certbot} to reload ${common.nginx} when it successfully renews certificates:`,
+    certbotDoesNotNeedToBeSetupForYourConfiguration: `${certbot} does not need to be set up for your ${common.nginx} configuration.`,
+    certbot,
 };

src/nginxconfig/i18n/en/templates/setup_sections/download.js

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
     downloadTheGeneratedConfig: '<b>Download</b> the generated config:',
     andUploadItToYourServers: 'and <b>upload</b> it to your server\'s',
@@ -21,8 +23,8 @@ export default {
     or: 'or, ',
     copyBase64StringOfCompressedConfig: 'Copy a base64 string of the compressed config',
     pasteItInYourServersCommandLineAndExecute: ', paste it in your server\'s command line and execute it.',
-    navigateToYourNginxConfigurationDirectoryOnYourServer: 'Navigate to your NGINX <b>configuration directory</b> on your server:',
-    createABackupOfYourCurrentNginxConfiguration: 'Create a <b>backup</b> of your current NGINX configuration:',
+    navigateToYourNginxConfigurationDirectoryOnYourServer: `Navigate to your ${common.nginx} <b>configuration directory</b> on your server:`,
+    createABackupOfYourCurrentNginxConfiguration: `Create a <b>backup</b> of your current ${common.nginx} configuration:`,
     extractTheNewCompressedConfigurationArchiveUsingTar: '<b>Extract</b> the new compressed configuration archive using tar:',
     download: 'Download',
 };

src/nginxconfig/i18n/en/templates/setup_sections/go_live.js

@@ -14,8 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
     letsGoLive: 'Let\'s go live!',
-    reloadNginxToLoadInYourNewConfiguration: 'Reload NGINX to load in your new configuration:',
+    reloadNginxToLoadInYourNewConfiguration: `Reload ${common.nginx} to load in your new configuration:`,
     goLive: 'Go live!',
 };

src/nginxconfig/i18n/en/templates/setup_sections/ssl.js

@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import common from '../../common';
+
 export default {
     generateDiffieHellmanKeysByRunningThisCommandOnYourServer: 'Generate <b>Diffie-Hellman keys</b> by running this command on your server:',
-    createACommonAcmeChallengeDirectoryForLetsEncrypt: 'Create a common <b>ACME-challenge</b> directory (for <b>Let\'s Encrypt</b>):',
-    noAdditionalStepsAreNeededToSetUpSslForNginx: 'No additional steps are needed to set up SSL for your NGINX configuration.',
-    sslInit: 'SSL init',
+    createACommonAcmeChallengeDirectoryForLetsEncrypt: `Create a common <b>ACME-challenge</b> directory (for <b>${common.letsEncrypt}</b>):`,
+    noAdditionalStepsAreNeededToSetUpSslForNginx: `No additional steps are needed to set up ${common.ssl} for your ${common.nginx} configuration.`,
+    sslInit: `${common.ssl} init`,
 };