davejansen/snikket-web-portal
1
0
Fork 0
Code Issues Pull Requests Activity

Streamline wording: Use service instead of instance/server

Browse Source
This commit is contained in:
Jonas Schäfer
2021-01-23 14:51:23 +01:00
parent 7e2c4012cc
commit 5ca33fd69d
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
snikket_web/templates/about.html
View File

@@ -8,8 +8,8 @@
<div class="box el-2"> <div class="box el-2">
<h1>{% trans %}About Snikket{% endtrans %}</h1> <h1>{% trans %}About Snikket{% endtrans %}</h1>
<p>{% trans snikket_url="https://snikket.org" %}To learn more about Snikket, visit the <a href="{{ snikket_url}}">Snikket website</a>.{% endtrans %}</p> <p>{% trans snikket_url="https://snikket.org" %}To learn more about Snikket, visit the <a href="{{ snikket_url}}">Snikket website</a>.{% endtrans %}</p>
<h2>{% trans %}About this Server{% endtrans %}</h2> <h2>{% trans %}About this Service{% endtrans %}</h2>
<p>{% trans site_name=config["SITE_NAME"] %}This is the Snikket server <em>{{ site_name }}</em>.{% endtrans %}</p> <p>{% trans site_name=config["SITE_NAME"] %}This is the Snikket service <em>{{ site_name }}</em>.{% endtrans %}</p>
<h3>{% trans %}Licenses{% endtrans %}</h3> <h3>{% trans %}Licenses{% endtrans %}</h3>
<p>{% trans agpl_url="https://www.gnu.org/licenses/agpl.html" %}The web portal software is licensed under the terms of the <a href="{{ agpl_url }}">Affero GNU General Public License, version 3.0 or later</a>. The full terms of the license can be reviewed using the aforementioned link.{% endtrans %}</p> <p>{% trans agpl_url="https://www.gnu.org/licenses/agpl.html" %}The web portal software is licensed under the terms of the <a href="{{ agpl_url }}">Affero GNU General Public License, version 3.0 or later</a>. The full terms of the license can be reviewed using the aforementioned link.{% endtrans %}</p>
<p>{% trans source_url="https://github.com/snikket-im/snikket-web-portal/" %}The source code of the web portal can be downloaded and viewed in <a href="{{ source_url }}">its GitHub repository</a>.{% endtrans %}</p> <p>{% trans source_url="https://github.com/snikket-im/snikket-web-portal/" %}The source code of the web portal can be downloaded and viewed in <a href="{{ source_url }}">its GitHub repository</a>.{% endtrans %}</p>

2
snikket_web/templates/admin_circles.html
View File

@@ -33,7 +33,7 @@
{%- else -%} {%- else -%}
<div class="box primary"> <div class="box primary">
<header>{% trans %}No circles{% endtrans %}</header> <header>{% trans %}No circles{% endtrans %}</header>
<p>{% trans %}Currently, there are no circles on this instance. Use the form below to create one.{% endtrans %}</p> <p>{% trans %}Currently, there are no circles on this service. Use the form below to create one.{% endtrans %}</p>
</div> </div>
{%- endif -%} {%- endif -%}
<h2>{% trans %}New circle{% endtrans %}</h2> <h2>{% trans %}New circle{% endtrans %}</h2>

2
snikket_web/templates/admin_create_invite_form.html
View File

@@ -3,7 +3,7 @@
{{- invite_form.csrf_token -}} {{- invite_form.csrf_token -}}
<div class="form layout-expanded"> <div class="form layout-expanded">
<h2 class="form-title">{% trans %}Create new invitation{% endtrans %}</h2> <h2 class="form-title">{% trans %}Create new invitation{% endtrans %}</h2>
<p class="form-descr weak">{% trans %}Create a new invitation link to invite more users to your Snikket instance by clicking the button below.{% endtrans %}</p> <p class="form-descr weak">{% trans %}Create a new invitation link to invite more users to your Snikket service by clicking the button below.{% endtrans %}</p>
<div class="f-ebox"> <div class="f-ebox">
{{ invite_form.reusable }} {{ invite_form.reusable }}
{{ invite_form.reusable.label }} {{ invite_form.reusable.label }}

2
snikket_web/templates/admin_edit_circle.html
View File

@@ -62,7 +62,7 @@
{%- else -%} {%- else -%}
<div class="box hint el-2"> <div class="box hint el-2">
<header>{% trans %}No users left{% endtrans %}</header> <header>{% trans %}No users left{% endtrans %}</header>
<p>{% trans %}All users on this instance are already in this circle.{% endtrans %}</p> <p>{% trans %}All users on this service are already in this circle.{% endtrans %}</p>
</div> </div>
{%- endif -%} {%- endif -%}
</form> </form>

2
snikket_web/templates/admin_edit_invite.html
View File

@@ -15,7 +15,7 @@
<dt>{% trans %}Link{% endtrans %}</dt> <dt>{% trans %}Link{% endtrans %}</dt>
<dd>{% call showuri(invite.landing_page) %}{% endcall %}</dd> <dd>{% call showuri(invite.landing_page) %}{% endcall %}</dd>
<dt>{% trans %}Reusability{% endtrans %}</dt> <dt>{% trans %}Reusability{% endtrans %}</dt>
<dd>{% if invite.reusable %}{% trans %}This invitation link can be used arbitrarily often, until it expires, is revoked or a server-wide user limit is reached.{% endtrans %}{% else %}{% trans %}This invitation link can only be used once and is then depleted.{% endtrans %}{% endif %}</dd> <dd>{% if invite.reusable %}{% trans %}This invitation link can be used arbitrarily often, until it expires, is revoked or a service-wide user limit is reached.{% endtrans %}{% else %}{% trans %}This invitation link can only be used once and is then depleted.{% endtrans %}{% endif %}</dd>
{%- set ngroups = invite.group_ids | length -%} {%- set ngroups = invite.group_ids | length -%}
{%- if ngroups > 1 -%} {%- if ngroups > 1 -%}
{#- not supported via the web UI, but we should still display it properly -#} {#- not supported via the web UI, but we should still display it properly -#}

2
snikket_web/templates/backend_error.html
View File

@@ -2,5 +2,5 @@
{% block box -%} {% block box -%}
<header>{% trans %}Internal error{% endtrans %}</header> <header>{% trans %}Internal error{% endtrans %}</header>
<p>{% trans %}The web portal was not able to communicate with the backend.{% endtrans %}</p> <p>{% trans %}The web portal was not able to communicate with the backend.{% endtrans %}</p>
<p>{% trans %}Please try again later and/or inform your Snikket instance admin.{% endtrans %}</p> <p>{% trans %}Please try again later and/or inform your Snikket service admin.{% endtrans %}</p>
{%- endblock %} {%- endblock %}

2
snikket_web/templates/internal_error.html
View File

@@ -2,5 +2,5 @@
{% block box -%} {% block box -%}
<header>{% trans %}Internal error{% endtrans %}</header> <header>{% trans %}Internal error{% endtrans %}</header>
<p>{% trans %}The web portal encountered an internal error.{% endtrans %}</p> <p>{% trans %}The web portal encountered an internal error.{% endtrans %}</p>
<p>{% trans %}Please try again later and/or inform your Snikket instance admin.{% endtrans %}</p> <p>{% trans %}Please try again later and/or inform your Snikket service admin.{% endtrans %}</p>
{%- endblock %} {%- endblock %}

2
snikket_web/templates/login.html
View File

@@ -33,6 +33,6 @@
</from> </from>
</div></main></div> </div></main></div>
<footer> <footer>
<ul><li>{% trans about_url=url_for('.about') %}A <a href="{{ about_url }}">Snikket</a> server{% endtrans %}</li></ul> <ul><li>{% trans about_url=url_for('.about') %}A <a href="{{ about_url }}">Snikket</a> service{% endtrans %}</li></ul>
</footer> </footer>
{% endblock %} {% endblock %}

2
snikket_web/templates/unauth.html
View File

@@ -11,7 +11,7 @@
<footer> <footer>
<ul> <ul>
{#- -#} {#- -#}
<li>{% trans about_url=url_for('main.about') %}A <a href="{{ about_url }}">Snikket</a> server{% endtrans %}</li> <li>{% trans about_url=url_for('main.about') %}A <a href="{{ about_url }}">Snikket</a> service{% endtrans %}</li>
{#- -#} {#- -#}
</ul> </ul>
</footer> </footer>

2
snikket_web/templates/user_home.html
View File

@@ -13,7 +13,7 @@
{% if user_info.is_admin %} {% if user_info.is_admin %}
<a class="card" href="{{ url_for('admin.index') }}"> <a class="card" href="{{ url_for('admin.index') }}">
<h2>{% trans %}Admin dashboard{% endtrans %}</h2> <h2>{% trans %}Admin dashboard{% endtrans %}</h2>
<p>{% trans %}Manage users and invitations of this Snikket instance.{% endtrans %}</p> <p>{% trans %}Manage users and invitations of this Snikket service.{% endtrans %}</p>
</a> </a>
{% endif %} {% endif %}
<a class="card" href="{{ url_for('.logout') }}"> <a class="card" href="{{ url_for('.logout') }}">

22
snikket_web/translations/messages.pot
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-01-23 14:17+0100\n" "POT-Creation-Date: 2021-01-23 14:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -171,12 +171,12 @@ msgid ""
msgstr "" msgstr ""
#: snikket_web/templates/about.html:11 #: snikket_web/templates/about.html:11
msgid "About this Server" msgid "About this Service"
msgstr "" msgstr ""
#: snikket_web/templates/about.html:12 #: snikket_web/templates/about.html:12
#, python-format #, python-format
msgid "This is the Snikket server <em>%(site_name)s</em>." msgid "This is the Snikket service <em>%(site_name)s</em>."
msgstr "" msgstr ""
#: snikket_web/templates/about.html:13 #: snikket_web/templates/about.html:13
@@ -250,7 +250,7 @@ msgstr ""
#: snikket_web/templates/admin_circles.html:36 #: snikket_web/templates/admin_circles.html:36
msgid "" msgid ""
"Currently, there are no circles on this instance. Use the form below to " "Currently, there are no circles on this service. Use the form below to "
"create one." "create one."
msgstr "" msgstr ""
@@ -268,8 +268,8 @@ msgstr ""
#: snikket_web/templates/admin_create_invite_form.html:6 #: snikket_web/templates/admin_create_invite_form.html:6
msgid "" msgid ""
"Create a new invitation link to invite more users to your Snikket " "Create a new invitation link to invite more users to your Snikket service"
"instance by clicking the button below." " by clicking the button below."
msgstr "" msgstr ""
#: snikket_web/templates/admin_debug_user.html:8 #: snikket_web/templates/admin_debug_user.html:8
@@ -376,7 +376,7 @@ msgid "No users left"
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_circle.html:65 #: snikket_web/templates/admin_edit_circle.html:65
msgid "All users on this instance are already in this circle." msgid "All users on this service are already in this circle."
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_invite.html:8 #: snikket_web/templates/admin_edit_invite.html:8
@@ -401,7 +401,7 @@ msgstr ""
#: snikket_web/templates/admin_edit_invite.html:18 #: snikket_web/templates/admin_edit_invite.html:18
msgid "" msgid ""
"This invitation link can be used arbitrarily often, until it expires, is " "This invitation link can be used arbitrarily often, until it expires, is "
"revoked or a server-wide user limit is reached." "revoked or a service-wide user limit is reached."
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_invite.html:18 #: snikket_web/templates/admin_edit_invite.html:18
@@ -567,7 +567,7 @@ msgstr ""
#: snikket_web/templates/backend_error.html:5 #: snikket_web/templates/backend_error.html:5
#: snikket_web/templates/internal_error.html:5 #: snikket_web/templates/internal_error.html:5
msgid "Please try again later and/or inform your Snikket instance admin." msgid "Please try again later and/or inform your Snikket service admin."
msgstr "" msgstr ""
#: snikket_web/templates/copy-snippet.html:106 #: snikket_web/templates/copy-snippet.html:106
@@ -608,7 +608,7 @@ msgstr ""
#: snikket_web/templates/login.html:36 snikket_web/templates/unauth.html:14 #: snikket_web/templates/login.html:36 snikket_web/templates/unauth.html:14
#, python-format #, python-format
msgid "A <a href=\"%(about_url)s\">Snikket</a> server" msgid "A <a href=\"%(about_url)s\">Snikket</a> service"
msgstr "" msgstr ""
#: snikket_web/templates/user_home.html:3 #: snikket_web/templates/user_home.html:3
@@ -640,7 +640,7 @@ msgid "Admin dashboard"
msgstr "" msgstr ""
#: snikket_web/templates/user_home.html:16 #: snikket_web/templates/user_home.html:16
msgid "Manage users and invitations of this Snikket instance." msgid "Manage users and invitations of this Snikket service."
msgstr "" msgstr ""
#: snikket_web/templates/user_home.html:20 #: snikket_web/templates/user_home.html:20