Skip to content

Translation: Fix some plugins#122

Merged
fabianfrz merged 6 commits intoopnsense:masterfrom
fabianfrz:translation
Apr 18, 2017
Merged

Translation: Fix some plugins#122
fabianfrz merged 6 commits intoopnsense:masterfrom
fabianfrz:translation

Conversation

@fabianfrz
Copy link
Copy Markdown
Member

@fabianfrz fabianfrz commented Apr 18, 2017

  • quagga
  • haproxy
  • ftp-proxy
  • acme-client
  • tinc

Feedback from plugin maintainers is welcome.

@fabianfrz fabianfrz self-assigned this Apr 18, 2017
@fabianfrz fabianfrz requested a review from fichtner April 18, 2017 09:35
@fabianfrz fabianfrz requested a review from fraenki April 18, 2017 11:31
@fabianfrz
Copy link
Copy Markdown
Member Author

@fraenki please verify that this changes are working with your plugins.

<b>{{ 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('<a href="https://letsencrypt.org/how-it-works/">', '</a>', '<a href="https://letsencrypt.org/docs/rate-limits/">', '</a>') }}</b>{{ 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('<a href="https://letsencrypt.org/docs/staging-environment/">', '</a>') }}
<br/>
{{ lang._("Please use the ") }}<a href="https://github.com/opnsense/plugins/issues">{{ lang._("GitHub Issue Tracker ") }}</a>{{ lang._("to report bugs or request new features.") }}
{{ lang._("Please use the %sGitHub Issue Tracker%s to report bugs or request new features.") | format('<a href="https://github.com/opnsense/plugins/issues">', '</a>') }}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fraenki Gegen eine solche Codebase habe ich 2 Jahre lang gearbeitet. Das wollen wir nicht wieder haben sondern die Strings sollen sauber zusammenhängen.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, "GitHub" may not always be GitHub :P

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But for now it is ;)
It could be omitted but that is another topic.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fabianfrz Is there a guideline for this in the docs somewhere? This would be useful.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly not for translations...

Copy link
Copy Markdown
Member Author

@fabianfrz fabianfrz Apr 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly not for translations...
this is in the docs of phalcon (had to lookup this too).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fabianfrz I vote for a short paragraph in the OPNsense coding guidelines... maybe you could contribute it :)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fraenki: I sent an email to @jschellevis about this topic.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would already refer "%sissue tracker%s"

@fabianfrz
Copy link
Copy Markdown
Member Author

@fichtner your approval is missing

<br/>
<br/>
<p>Includes code from the <a href="https://github.com/Neilpang/acme.sh">Neilpang/acme.sh</a> project. Licensed under GPLv3.<br/>Let's Encrypt™ is a trademark of the Internet Security Research Group. All rights reserved.</p>
<p>{{ lang._("This plugin includes code from the %sNeilpang/acme.sh%s project.") | format('<a href="https://github.com/Neilpang/acme.sh">', '</a>' ) }} {{ lang._('Licensed under GPLv3.') }}<br/>{{ lang._('Let's Encrypt™ is a trademark of the Internet Security Research Group. All rights reserved.') }}</p>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should make this more flexible with "%s" instead of "%sNeilpang/acme.sh%s" ? One doesn't make sense without the other. The license is also part of the first string.

<b>{{ 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('<a href="https://letsencrypt.org/how-it-works/">', '</a>', '<a href="https://letsencrypt.org/docs/rate-limits/">', '</a>') }}</b>{{ 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('<a href="https://letsencrypt.org/docs/staging-environment/">', '</a>') }}
<br/>
{{ lang._("Please use the ") }}<a href="https://github.com/opnsense/plugins/issues">{{ lang._("GitHub Issue Tracker ") }}</a>{{ lang._("to report bugs or request new features.") }}
{{ lang._("Please use the %sGitHub Issue Tracker%s to report bugs or request new features.") | format('<a href="https://github.com/opnsense/plugins/issues">', '</a>') }}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would already refer "%sissue tracker%s"

@fabianfrz
Copy link
Copy Markdown
Member Author

@fichtner applied your change request

@fabianfrz fabianfrz merged commit 393557c into opnsense:master Apr 18, 2017
@fabianfrz fabianfrz deleted the translation branch April 18, 2017 13:55
fichtner pushed a commit that referenced this pull request Apr 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants