From 393557c22046ca420f9cf1f8a13baa5b30d9bbb1 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Tue, 18 Apr 2017 15:55:48 +0200 Subject: [PATCH] Translation: Fix some plugins (#122) * translation fixes for Quagga * translation fixes for haproxy and ftp proxy * translation fix: ACME-client * apply changes to settings.volt requested by @fichtner --- .../mvc/app/views/OPNsense/FtpProxy/index.volt | 2 +- .../mvc/app/views/OPNsense/HAProxy/index.volt | 16 ++++++++-------- .../mvc/app/views/OPNsense/Quagga/bgp.volt | 2 +- .../mvc/app/views/OPNsense/Quagga/ospf.volt | 4 ++-- .../app/views/OPNsense/AcmeClient/accounts.volt | 2 +- .../app/views/OPNsense/AcmeClient/actions.volt | 2 +- .../views/OPNsense/AcmeClient/certificates.volt | 2 +- .../app/views/OPNsense/AcmeClient/settings.volt | 6 +++--- .../views/OPNsense/AcmeClient/validations.volt | 2 +- .../mvc/app/views/OPNsense/Tinc/index.volt | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/net/ftp-proxy/src/opnsense/mvc/app/views/OPNsense/FtpProxy/index.volt b/net/ftp-proxy/src/opnsense/mvc/app/views/OPNsense/FtpProxy/index.volt index cd2f880da..cb6f48008 100644 --- a/net/ftp-proxy/src/opnsense/mvc/app/views/OPNsense/FtpProxy/index.volt +++ b/net/ftp-proxy/src/opnsense/mvc/app/views/OPNsense/FtpProxy/index.volt @@ -116,4 +116,4 @@ POSSIBILITY OF SUCH DAMAGE. {# include dialog #} -{{ partial("layout_partials/base_dialog",['fields':formDialogEdit,'id':'DialogEdit','label':'Edit Proxy'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogEdit,'id':'DialogEdit','label':lang._('Edit Proxy')])}} diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt index 891095a5e..38e29d413 100644 --- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt +++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt @@ -647,11 +647,11 @@ POSSIBILITY OF SUCH DAMAGE. {# include dialogs #} -{{ partial("layout_partials/base_dialog",['fields':formDialogFrontend,'id':'DialogFrontend','label':'Edit Frontend'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogBackend,'id':'DialogBackend','label':'Edit Backend'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogServer,'id':'DialogServer','label':'Edit Server'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogHealthcheck,'id':'DialogHealthcheck','label':'Edit Health Check'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogAction,'id':'DialogAction','label':'Edit Action'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogAcl,'id':'DialogAcl','label':'Edit ACL'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogLua,'id':'DialogLua','label':'Edit Lua Script'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogErrorfile,'id':'DialogErrorfile','label':'Edit Error File'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogFrontend,'id':'DialogFrontend','label':lang._('Edit Frontend')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogBackend,'id':'DialogBackend','label':lang._('Edit Backend')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogServer,'id':'DialogServer','label':lang._('Edit Server')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogHealthcheck,'id':'DialogHealthcheck','label':lang._('Edit Health Check')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogAction,'id':'DialogAction','label':lang._('Edit Action')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogAcl,'id':'DialogAcl','label':lang._('Edit ACL')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogLua,'id':'DialogLua','label':lang._('Edit Lua Script')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogErrorfile,'id':'DialogErrorfile','label':lang._('Edit Error File')])}} diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt index 6592ea809..7b4e12829 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt @@ -109,4 +109,4 @@ $(document).ready(function() { }); -{{ partial("layout_partials/base_dialog",['fields':formDialogEditBGPNeighbor,'id':'DialogEditBGPNeighbor','label':'Edit Neighbor'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogEditBGPNeighbor,'id':'DialogEditBGPNeighbor','label':lang._('Edit Neighbor')])}} diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt index 21699a390..ce75f1cbc 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt @@ -147,5 +147,5 @@ $( document ).ready(function() { }); -{{ partial("layout_partials/base_dialog",['fields':formDialogEditNetwork,'id':'DialogEditNetwork','label':'Edit Network'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogEditInterface,'id':'DialogEditInterface','label':'Edit Interface'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogEditNetwork,'id':'DialogEditNetwork','label':lang._('Edit Network')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogEditInterface,'id':'DialogEditInterface','label':lang._('Edit Interface')])}} diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt index 7d1d54bb5..f9ecec349 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt @@ -84,4 +84,4 @@ POSSIBILITY OF SUCH DAMAGE. {# include dialogs #} -{{ partial("layout_partials/base_dialog",['fields':formDialogAccount,'id':'DialogAccount','label':'Edit Account'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogAccount,'id':'DialogAccount','label':{{ lang._('Edit Account')])}} diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/actions.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/actions.volt index 2eef0c115..20ac0e016 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/actions.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/actions.volt @@ -97,4 +97,4 @@ POSSIBILITY OF SUCH DAMAGE. {# include dialogs #} -{{ partial("layout_partials/base_dialog",['fields':formDialogAction,'id':'DialogAction','label':'Edit Restart Action'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogAction,'id':'DialogAction','label':{{ lang._('Edit Restart Action')])}} diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt index 051f3e7af..fdcb03879 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt @@ -417,4 +417,4 @@ POSSIBILITY OF SUCH DAMAGE. {# include dialogs #} -{{ partial("layout_partials/base_dialog",['fields':formDialogCertificate,'id':'DialogCertificate','label':'Edit Certificate'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogCertificate,'id':'DialogCertificate','label':{{ lang._('Edit Certificate')])}} diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt index 96660070d..c815bcbde 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/settings.volt @@ -204,12 +204,12 @@ POSSIBILITY OF SUCH DAMAGE.
- {{ lang._("Please read the official ") }}{{ lang._("Let's Encrypt documentation") }}{{ lang._(" before using this plugin. Otherwise you will easily hit it's ") }}{{ lang._("rate limits") }}{{ lang._(" and thus all your attempts to issue a certificate will fail. ") }}{{ lang._("Please use Let's Encrypts ") }}{{ lang._("Staging servers") }}{{ lang._(" when using this plugin for the first time or while testing a new validation method. You'll have to re-issue your certificates when switching from staging to production servers to get valid certificates.") }} + {{ lang._("Please read the official %sLet's Encrypt documentation%s before using this plugin. Otherwise you will easily hit it's %srate limits%s and thus all your attempts to issue a certificate will fail.") | format('', '', '', '') }}{{ lang._("Please use Let's Encrypts %staging servers%s when using this plugin for the first time or while testing a new validation method. You'll have to re-issue your certificates when switching from staging to production servers to get valid certificates.") | format('', '') }}
- {{ lang._("Please use the ") }}{{ lang._("GitHub Issue Tracker ") }}{{ lang._("to report bugs or request new features.") }} + {{ lang._("Please use the %sissue tracker%s to report bugs or request new features.") | format('', '') }}

-

Includes code from the Neilpang/acme.sh project. Licensed under GPLv3.
Let's Encrypt™ is a trademark of the Internet Security Research Group. All rights reserved.

+

{{ lang._("This plugin includes code from the %s project.") | format('Neilpang/acme.sh' ) }} {{ lang._('Licensed under GPLv3.') }}
{{ lang._('Let's Encrypt™ is a trademark of the Internet Security Research Group. All rights reserved.') }}


diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/validations.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/validations.volt index d42a0f1ce..ff488ea16 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/validations.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/validations.volt @@ -109,4 +109,4 @@ POSSIBILITY OF SUCH DAMAGE. {# include dialogs #} -{{ partial("layout_partials/base_dialog",['fields':formDialogValidation,'id':'DialogValidation','label':'Edit Validation Method'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogValidation,'id':'DialogValidation','label':lang._('Edit Validation Method')])}} diff --git a/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt b/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt index 9f0fa9917..730e6e20f 100644 --- a/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt +++ b/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt @@ -153,5 +153,5 @@ POSSIBILITY OF SUCH DAMAGE. {# include dialogs #} -{{ partial("layout_partials/base_dialog",['fields':formDialogNetwork,'id':'DialogNetwork','label':'Edit Network'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogHost,'id':'DialogHost','label':'Edit Host'])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogNetwork,'id':'DialogNetwork','label':lang._('Edit Network')])}} +{{ partial("layout_partials/base_dialog",['fields':formDialogHost,'id':'DialogHost','label':lang._('Edit Host')])}}