diff --git a/app/templates/api/create_edit_token.html b/app/templates/api/create_edit_token.html index 44b2b00..3372bc2 100644 --- a/app/templates/api/create_edit_token.html +++ b/app/templates/api/create_edit_token.html @@ -14,7 +14,7 @@ {% if token %}
- +
{% endif %} @@ -30,15 +30,14 @@
{{ _("Access Token") }}

- For security reasons, access tokens will only be shown once. - Reset the token if it is lost. + {{ _("For security reasons, access tokens will only be shown once. Reset the token if it is lost.") }}

{% if access_token %} {% endif %}
- +
diff --git a/app/templates/api/list_tokens.html b/app/templates/api/list_tokens.html index a53a0ec..a5bbd54 100644 --- a/app/templates/api/list_tokens.html +++ b/app/templates/api/list_tokens.html @@ -5,8 +5,8 @@ {% endblock %} {% block pane %} - Create - API Documentation + {{ _("Create") }} + {{ _("API Documentation") }}

{{ _("API Tokens") }}

@@ -16,7 +16,7 @@ {% else %} - No tokens created + {{ _("No tokens created") }} {% endfor %}
diff --git a/app/templates/base.html b/app/templates/base.html index 3c67604..b5a5b4f 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -190,10 +190,10 @@
  • -
  • - +
  • + - Help make more of CDB translatable + {{ _("Help translate ContentDB") }}
    • diff --git a/app/templates/emails/notification.html b/app/templates/emails/notification.html index 597f026..d6db162 100644 --- a/app/templates/emails/notification.html +++ b/app/templates/emails/notification.html @@ -16,15 +16,15 @@

    - View Notification + {{ _("View Notification") }}

    {% endblock %} {% block footer %} - You are receiving this email because you are a registered user of ContentDB, - and have email notifications enabled.
    + {{ _("You are receiving this email because you are a registered user of ContentDB, and have email notifications enabled.") }} +
    {{ _("Manage your preferences") }} diff --git a/app/templates/emails/notification_digest.html b/app/templates/emails/notification_digest.html index 67c68af..87d64ac 100644 --- a/app/templates/emails/notification_digest.html +++ b/app/templates/emails/notification_digest.html @@ -19,15 +19,15 @@

    - View Notifications + {{ _("View Notifications") }}

    {% endblock %} {% block footer %} - You are receiving this email because you are a registered user of ContentDB, - and have email notifications enabled.
    + {{ _("You are receiving this email because you are a registered user of ContentDB, and have email notifications enabled.") }} +
    {{ _("Manage your preferences") }} diff --git a/app/templates/emails/verify.html b/app/templates/emails/verify.html index 559d183..d4df3b1 100644 --- a/app/templates/emails/verify.html +++ b/app/templates/emails/verify.html @@ -1,33 +1,34 @@ {% extends "emails/base.html" %} {% block content %} -

    Hello!

    +

    {{ _("Hello!") }}

    - This email has been sent to you because someone (hopefully you) - has entered your email address as a user's email. + {{ _("This email has been sent to you because someone (hopefully you) has entered your email address as a user's email.") }}

    - If it wasn't you, then just delete this email. + {{ _("If it wasn't you, then just delete this email.") }}

    - If this was you, then please click this link to confirm the address: + {{ _("If this was you, then please click this link to confirm the address:") }}

    - Confirm Email Address + {{ _("Confirm Email Address") }}

    - Or paste this into your browser: {{ abs_url_for('users.verify_email', token=token) }} + {{ _("Or paste this into your browser:") }} + {{ abs_url_for('users.verify_email', token=token) }}

    {% endblock %} {% block footer %} - You are receiving this email because someone (hopefully you) entered your email address as a user's email.
    + {{ _("You are receiving this email because someone (hopefully you) entered your email address as a user's email.") }} +
    {{ _("Unsubscribe") }} diff --git a/app/templates/emails/verify_unsubscribe.html b/app/templates/emails/verify_unsubscribe.html index f9b3648..a75d7b9 100644 --- a/app/templates/emails/verify_unsubscribe.html +++ b/app/templates/emails/verify_unsubscribe.html @@ -1,22 +1,24 @@ {% extends "emails/base.html" %} {% block content %} -

    Hello!

    +

    + {{ _("Hello!") }} +

    - We're sorry to see you go. You just need to do one more thing before your email is blacklisted. + {{ _("We're sorry to see you go. You just need to do one more thing before your email is blacklisted.") }}

    - Unsubscribe + {{ _("Unsubscribe") }}

    - Or paste this into your browser: {{ abs_url_for('users.unsubscribe', token=sub.token) }} + {{ _("Or paste this into your browser:") }} {{ abs_url_for('users.unsubscribe', token=sub.token) }}

    {% endblock %} {% block footer %} - You are receiving this email because someone (hopefully you) entered your email address in the unsubscribe form. + {{ _("You are receiving this email because someone (hopefully you) entered your email address in the unsubscribe form.") }} {% endblock %} diff --git a/app/templates/macros/audit_log.html b/app/templates/macros/audit_log.html index 38c18ec..410ac0c 100644 --- a/app/templates/macros/audit_log.html +++ b/app/templates/macros/audit_log.html @@ -29,7 +29,7 @@ {{ entry.causer.username }} {% else %} - Deleted User + {{ _("Deleted User") }} {% endif %} @@ -61,7 +61,7 @@ {% else %} -

    No audit log entires.

    +

    {{ _("No audit log entries.") }}

    {% endfor %} {% endmacro %} diff --git a/app/templates/macros/forms.html b/app/templates/macros/forms.html index dec9bf2..208b37e 100644 --- a/app/templates/macros/forms.html +++ b/app/templates/macros/forms.html @@ -49,7 +49,7 @@ {{ field(class_=fieldclass or 'form-control', **kwargs) }} - View + {{ _("View") }} @@ -104,7 +104,7 @@ {% endif %}
    - +
    diff --git a/app/templates/macros/package_approval.html b/app/templates/macros/package_approval.html index db46f4e..d7ea7ea 100644 --- a/app/templates/macros/package_approval.html +++ b/app/templates/macros/package_approval.html @@ -2,7 +2,7 @@
    - State: {{ package.state.value }} + {{ _("State") }}: {{ package.state.value }} {% for state in package.getNextStates(current_user) %} @@ -18,9 +18,13 @@ {% set message %} {% if package.checkPerm(current_user, "MAKE_RELEASE") %} {% if package.update_config %} - Create first release + + {{ _("Create first release") }} + {% else %} - Set up releases + + {{ _("Set up releases") }} + {% endif %} {{ _("You need to create a release before this package can be approved.") }} {% else %} @@ -29,36 +33,38 @@ {% endset %} {% elif (package.type == package.type.GAME or package.type == package.type.TXP) and package.screenshots.count() == 0 %} - {% set message = "You need to add at least one screenshot." %} + {% set message = _("You need to add at least one screenshot.") %} {% elif package.getMissingHardDependenciesQuery().count() > 0 %} {% set deps = package.getMissingHardDependencies() | join(", ") %} - {% set message = "The following hard dependencies need to be added to ContentDB first: " + deps %} + {% set message = _("The following hard dependencies need to be added to ContentDB first: %(deps)s", deps) %} {% elif topic_error_lvl == "danger" %} {% elif package.state == package.state.READY_FOR_REVIEW and ("Other" in package.license.name or "Other" in package.media_license.name) %} - {% set message = "Please wait for the license to be added to CDB." %} + {% set message = _("Please wait for the license to be added to CDB.") %} {% else %} {% set level = "info" %} {% set message %} {% if package.screenshots.count() == 0 %} - You should add at least one screenshot, but this isn't required.
    + + {{ _("You should add at least one screenshot, but this isn't required.") }} +
    {% endif %} {% if package.state == package.state.READY_FOR_REVIEW %} {% if not package.getDownloadRelease() %} - Please wait for the release to be approved. + {{ _("Please wait for the release to be approved.") }} {% elif package.checkPerm(current_user, "APPROVE_NEW") %} - You can now approve this package if you're ready. + {{ _("You can now approve this package if you're ready.") }} {% else %} - Please wait for the package to be approved. + {{ _("Please wait for the package to be approved.") }} {% endif %} {% else %} {% if package.checkPerm(current_user, "EDIT_PACKAGE") %} - You can now submit this package for approval if you're ready. + {{ _("You can now submit this package for approval if you're ready.") }} {% else %} - This package can be submitted for approval when ready. + {{ _("This package can be submitted for approval when ready.") }} {% endif %} {% endif %} {% endset %} @@ -88,16 +94,18 @@ More info {% if conflicting_modnames | length > 4 %} - Please make sure that this package has the right to the names it uses. + {{ _("Please make sure that this package has the right to the names it uses.") }} {% else %} - Please make sure that this package has the right to the names {{ conflicting_modnames | join(", ") }}. + {{ _("Please make sure that this package has the right to the names %(names)s", names=conflicting_modnames | join(", ")) }}. {% endif %}
    {% endif %} {% if not package.review_thread and (package.author == current_user or package.checkPerm(current_user, "APPROVE_NEW")) %}
    - Open Thread + + {{ _("Open Thread") }} + {{ _("Package review thread") }}: {{ _("You can open a thread if you have a question for the reviewer or package author.") }} diff --git a/app/templates/macros/packagegridtile.html b/app/templates/macros/packagegridtile.html index 0144704..4713d9e 100644 --- a/app/templates/macros/packagegridtile.html +++ b/app/templates/macros/packagegridtile.html @@ -22,15 +22,15 @@ {% if not package.license.is_foss and not package.media_license.is_foss and package.type != package.type.TXP %}

    - Warning: Non-free code and media. + {{ _("Warning: Non-free code and media.") }}

    {% elif not package.license.is_foss and package.type != package.type.TXP %}

    - Warning: Non-free code. + {{ _("Warning: Non-free code.") }}

    {% elif not package.media_license.is_foss %}

    - Warning: Non-free media. + {{ _("Warning: Non-free media.") }}

    {% endif %}
    @@ -42,7 +42,7 @@ {% for p in packages %} {{ render_pkgtile(p, show_author) }} {% else %} -
  • No packages available
    • +
  • {{ _("No packages available") }}
    • {% endfor %} {% if packages %} {% for i in range(4) %} diff --git a/app/templates/macros/releases.html b/app/templates/macros/releases.html index c477e58..478a0c9 100644 --- a/app/templates/macros/releases.html +++ b/app/templates/macros/releases.html @@ -17,7 +17,7 @@ [{{ rel.commit_hash | truncate(5, end='') }}] {% endif %} - created {{ rel.releaseDate | date }}. + {{ _("created %(date)s", date=rel.releaseDate | date) }}. {% endfor %} @@ -44,7 +44,7 @@ [{{ rel.commit_hash | truncate(5, end='') }}] {% endif %} - created {{ rel.releaseDate | date }}. + {{ _("created %(date)s", date=rel.releaseDate | date) }}. {% endif %} @@ -55,9 +55,11 @@ {% macro render_releases(releases, package, current_user) -%} {% for rel in releases %}
    - Edit + {% if not rel.task_id and not rel.approved and rel.checkPerm(current_user, "APPROVE_RELEASE") %} - / Approve + {{ _("Edit / Approve") }} + {% else %} + {{ _("Edit") }} {% endif %} @@ -84,17 +86,21 @@ [{{ rel.commit_hash | truncate(5, end='') }}] {% endif %} - created {{ rel.releaseDate | date }}. + {{ _("created %(date)s", date=rel.releaseDate | date) }}. {% if (package.checkPerm(current_user, "MAKE_RELEASE") or rel.checkPerm(current_user, "APPROVE_RELEASE")) and rel.task_id %} - Importing... + + {{ _("Importing...") }} + {% elif not rel.approved %} - Waiting for approval. + {{ _("Waiting for approval.") }} {% endif %} {% if not rel.approved %}{% endif %}
    {% else %} -
    No releases available.
    +
    + {{ _("No releases available.") }} +
    {% endfor %} {% endmacro %} diff --git a/app/templates/macros/threads.html b/app/templates/macros/threads.html index 19a7717..9bfc64a 100644 --- a/app/templates/macros/threads.html +++ b/app/templates/macros/threads.html @@ -129,7 +129,7 @@ by {{ t.author.display_name }} {% else %} -

    No threads found

    +

    {{ _("No threads found") }}

    {% endfor %} {% endmacro %} @@ -209,6 +209,6 @@ {% else %} -

    No threads found

    +

    {{ _("No threads found") }}

    {% endfor %} {% endmacro %} diff --git a/app/templates/macros/todo.html b/app/templates/macros/todo.html index ff49386..f714ddc 100644 --- a/app/templates/macros/todo.html +++ b/app/templates/macros/todo.html @@ -54,7 +54,7 @@ {% else %} -

    No outdated packages.

    +

    {{ _("No outdated packages.") }}

    {% endfor %} {% endmacro %} diff --git a/app/templates/macros/topics.html b/app/templates/macros/topics.html index d75f9d9..279c6e9 100644 --- a/app/templates/macros/topics.html +++ b/app/templates/macros/topics.html @@ -2,11 +2,11 @@ - - {% if show_author %}{% endif %} - - - + + {% if show_author %}{% endif %} + + + {% for topic in topics %} @@ -15,7 +15,7 @@ {% if show_author %} @@ -26,15 +26,15 @@ {% if current_user == topic.author or topic.author.checkPerm(current_user, "CHANGE_AUTHOR") %} - Create + {{ _("Create") }} {% endif %} {% if show_discard and current_user.is_authenticated and topic.checkPerm(current_user, "TOPIC_DISCARD") %} {% if topic.discarded %} - Show + {{ _("Show") }} {% else %} - Discard + {{ _("Discard") }} {% endif %} {% endif %} @@ -53,14 +53,17 @@ {% for topic in topics %} {{ topic.title }} - {% if topic.wip %}[WIP]{% endif %} - {% if topic.discarded %}[Old]{% endif %} + {% if topic.wip %}[{{ _("WIP") }}]{% endif %} + {% if topic.discarded %}[{{ _("Old") }}]{% endif %} {% if topic.name %}[{{ topic.name }}]{% endif %} {% if show_author %} by {{ topic.author.display_name }} {% endif %} {% if topic.author == current_user or topic.author.checkPerm(current_user, "CHANGE_AUTHOR") %} - | Create + | + + {{ _("Create") }} + {% endif %} {% endfor %} diff --git a/app/templates/metapackages/list.html b/app/templates/metapackages/list.html index a2a468c..89f482f 100644 --- a/app/templates/metapackages/list.html +++ b/app/templates/metapackages/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Meta Packages +{{ _("Meta Packages") }} {% endblock %} {% block content %} @@ -34,7 +34,7 @@ Meta Packages {% else %} -
  • No meta packages found.
    • +
  • {{ _("No meta packages found.") }}
    • {% endfor %} {% endblock %} diff --git a/app/templates/metapackages/view.html b/app/templates/metapackages/view.html index 8166350..a4680e8 100644 --- a/app/templates/metapackages/view.html +++ b/app/templates/metapackages/view.html @@ -1,35 +1,37 @@ {% extends "base.html" %} {% block title %} -{{ mpackage.name }} - Meta Packages +{{ mpackage.name }} - {{ _("Meta Packages") }} {% endblock %} {% block content %} -

    Meta Package "{{ mpackage.name }}"

    +

    {{ _("Meta Package \"%(name)s\"", name=mpackage.name) }}

    -

    Provided By

    +

    {{ _("Provided By") }}

    {% from "macros/packagegridtile.html" import render_pkggrid %} {{ render_pkggrid(mpackage.packages.filter_by(state="APPROVED").all()) }} {% if similar_topics %} -

    Unforuntately, this isn't on ContentDB yet! Here's some forum topics:

    +

    + {{ _("Unfortunately, this isn't on ContentDB yet! Here's some forum topic(s):") }} +

    {% endif %} -

    Required By

    +

    {{ _("Required By") }}

    {{ render_pkggrid(dependers) }} -

    Optionally Used By

    +

    {{ _("Optionally Used By") }}

    {{ render_pkggrid(optional_dependers) }} {% endblock %} diff --git a/app/templates/notifications/list.html b/app/templates/notifications/list.html index 455d780..affbffc 100644 --- a/app/templates/notifications/list.html +++ b/app/templates/notifications/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Notifications + {{ _("Notifications") }} {% endblock %} {% block content %} @@ -15,16 +15,16 @@ Notifications {% endif %} -

    Notifications

    +

    {{ self.title() }}

    {% if current_user.notifications %}

    - Newest first. + {{ _("Newest first.") }}

    {% endif %} {% if editor_notifications %} -

    Your Notifications

    +

    {{ _("Your Notifications") }}

    {% endif %}
    @@ -58,12 +58,12 @@ Notifications
    {% else %} -

    No notifications

    +

    {{ _("No notifications") }}

    {% endfor %} {% if editor_notifications %} -

    Editor/Approver Notifications

    +

    {{ _("Editor/Approver Notifications") }}

    {% for n in editor_notifications %} @@ -96,7 +96,7 @@ Notifications
    {% else %} -

    No notifications

    +

    {{ _("No notifications") }}

    {% endfor %} {% endif %} diff --git a/app/templates/packages/alias_create_edit.html b/app/templates/packages/alias_create_edit.html index 2f8a945..f13dc7f 100644 --- a/app/templates/packages/alias_create_edit.html +++ b/app/templates/packages/alias_create_edit.html @@ -9,7 +9,9 @@ {% endblock %} {% block content %} -Back to Aliases + + {{ _("Back to Aliases") }} + {% from "macros/forms.html" import render_field, render_submit_field, render_toggle_field %}
    diff --git a/app/templates/packages/alias_list.html b/app/templates/packages/alias_list.html index 865bf3d..6fd63ce 100644 --- a/app/templates/packages/alias_list.html +++ b/app/templates/packages/alias_list.html @@ -9,7 +9,9 @@ {% endblock %} {% block content %} -Create + + {{ _("Create") }} +

    {{ _("Aliases for %(title)s by %(author)s", title=self.link(), author=package.author.display_name) }}

    @@ -19,7 +21,7 @@ {% else %}
    - No aliases + {{ _("No aliases") }}
    {% endfor %}
    diff --git a/app/templates/packages/audit.html b/app/templates/packages/audit.html index 97a28eb..6a5d849 100644 --- a/app/templates/packages/audit.html +++ b/app/templates/packages/audit.html @@ -1,11 +1,11 @@ {% extends "packages/package_base.html" %} {% block title %} -Audit Log +{{ _("Audit Log") }} {% endblock %} {% block content %} -

    Audit Log

    +

    {{ self.title() }}

    {% from "macros/pagination.html" import render_pagination %} {% from "macros/audit_log.html" import render_audit_log %} diff --git a/app/templates/packages/bulk_update_conf.html b/app/templates/packages/bulk_update_conf.html index aa01e48..16577d2 100644 --- a/app/templates/packages/bulk_update_conf.html +++ b/app/templates/packages/bulk_update_conf.html @@ -5,7 +5,7 @@ {% endblock %} {% block content %} - Help + {{ _("Help") }}

    {{ self.title() }}

    {{ _("Packages with Update Settings") }}

    diff --git a/app/templates/packages/list.html b/app/templates/packages/list.html index 8becd70..4083473 100644 --- a/app/templates/packages/list.html +++ b/app/templates/packages/list.html @@ -1,26 +1,29 @@ {% extends "base.html" %} {% block title %} -{{ title }} +{{ query_hint or _("Packages") }} +{% endblock %} + +{% block author_links %} + {% if authors %} + {% for author in authors %} + {{ author[0] }} + {% if not loop.last %} + , + {% endif %} + {% endfor %} + {% endif %} {% endblock %} {% block content %} {% if authors %}

    - Did you mean to search for packages by - - {% for author in authors %} - {{ author[0] }} - {% if not loop.last %} - , - {% endif %} - {% endfor %} - ? + {{ _("Did you mean to search for packages by %(authors)s?", authors=self.author_links()) }}

    {% endif %}     @@ -69,23 +76,29 @@
    TitleAuthorNameDateActions{{ _("Title") }}{{ _("Author") }}{{ _("Name") }}{{ _("Date") }}{{ _("Actions") }}
    {{ topic.title }} - {% if topic.wip %}[WIP]{% endif %} + {% if topic.wip %}[{{ _("WIP") }}]{% endif %} {{ topic.author.display_name}} {% if user.forums_username %} - Connected [{{ user.forums_username }}] + {{ _("Connected") }} [{{ user.forums_username }}] {% else %} - Please PM rubenwardy - on the forums to link your account. + {{ _("Please PM %(rubenwardy)s on the forums to link your account.", rubenwardy=self.ruben_link()) }} {% endif %}
    {% if user.github_username %} - Connected [{{ user.github_username }}] + {{ _("Connected") }} [{{ user.github_username }}] {% if user == current_user %} - View ContentDB's GitHub Permissions + + {{ _("View ContentDB's GitHub Permissions") }} + {% endif %} {% elif user == current_user %} - Link Github + + {{ _("Link Github") }} + {% else %} - None + {{ _("None") }} {% endif %}
    {% if current_user.rank.atLeast(current_user.rank.MODERATOR) %} - View All + + {{ _("View All") }} + {% endif %}

    {{ _("Recent Account Actions") }}

    @@ -96,7 +109,8 @@

    {{ _("Account Deletion and Deactivation") }}

    {% if current_user.rank.atLeast(current_user.rank.ADMIN) %} - Delete or Deactivate + + {{ _("Delete or Deactivate") }} {% else %}

    {{ _("Account Deletion and Deactivation isn't available to users yet.") }} diff --git a/app/templates/users/change_set_password.html b/app/templates/users/change_set_password.html index 2457a78..7e33b2a 100644 --- a/app/templates/users/change_set_password.html +++ b/app/templates/users/change_set_password.html @@ -8,14 +8,16 @@ {% if optional %}

    - It is recommended that you set a password for your account. + {{ _("It is recommended that you set a password for your account.") }} - Skip + + {{ _("Skip") }} +
    {% endif %} -

    Set Password

    +

    {{ _("Set Password") }}

    {% from "macros/forms.html" import render_field, render_submit_field %} @@ -31,15 +33,12 @@ {{ render_field(form.old_password, tabindex=230) }} {% endif %} - {{ render_field(form.password, tabindex=230) }} + {{ render_field(form.password, tabindex=230, hint=_("Must be at least 8 characters long.")) }} {{ render_field(form.password2, tabindex=240) }}

    - Must be at least 8 characters long. -

    -

    - Password suggestion - (Why?): + {{ _("Password suggestion") }} + ({{ _("Why?") }}): {{ suggested_password }}

    diff --git a/app/templates/users/claim.html b/app/templates/users/claim.html index 5e696d5..6665535 100644 --- a/app/templates/users/claim.html +++ b/app/templates/users/claim.html @@ -10,17 +10,22 @@

    {{ _("Do you have an account on the Minetest Forums?") }}

    - ContentDB will link your account to your forum account. + {{ _("ContentDB will link your account to your forum account.") }}

    - You don't need a forum account, however, it's recommended to make the most - out of the Minetest community. + {{ _("You don't need a forum account, however, it's recommended to make the most out of the Minetest community.") }}

    - Yes, I have a forums account - No, I don't have one - Create forum account + + {{ _("Yes, I have a forums account") }} + + + {{ _("No, I don't have one") }} + + + {{ _("Create forum account") }} +

    {% endblock %} diff --git a/app/templates/users/claim_forums.html b/app/templates/users/claim_forums.html index a79813f..2ebda5d 100644 --- a/app/templates/users/claim_forums.html +++ b/app/templates/users/claim_forums.html @@ -10,21 +10,21 @@ Create Account from Forums User

    {{ _("Confirm Your Account") }}

    - You'll need to use prove that you have access to your forum account using one of the options below.
    - This is so ContentDB can link your account to your forum account. + {{ _("You'll need to use prove that you have access to your forum account using one of the options below.") }}
    + {{ _("This is so ContentDB can link your account to your forum account.") }}

    - Don't have a forums account? - You can still sign up without one. + {{ _("Don't have a forums account?") }} + {{ _("You can still sign up without one.", link=url_for('users.register')) }}

    - Option 1 - Use GitHub field in forum profile + {{ _("Option 1") }} + {{ _("Use GitHub field in forum profile") }}
    @@ -32,20 +32,19 @@ Create Account from Forums User

    - Enter your forum username here: + {{ _("Enter your forum username here:") }}

    + placeholder="{{ _('Forum username') }}" pattern="[a-zA-Z0-9._ -]+" + title="{{ _('Only a-zA-Z0-9._ allowed') }}" required>

    - You'll need to have the GitHub field in your forum profile - filled out. Log into the forum and - - do that here. + {{ _("You'll need to have the GitHub field in your forum profile filled out.") }} + {{ _("Log into the forum and do that here.") }}

    - +
    @@ -53,8 +52,8 @@ Create Account from Forums User
    - Option 2 - Verification token + {{ _("Option 2") }} + {{ _("Verification token") }}
    @@ -62,33 +61,30 @@ Create Account from Forums User

    - Enter your forum username here: + {{ _("Enter your forum username here:") }}

    + placeholder="{{ _('Forum username') }}" pattern="[a-zA-Z0-9._ -]+" title="{{ _('Only a-zA-Z0-9._ allowed') }}" required>

    - Go to - - User Control Panel > Profile > Edit signature - + {{ _("Go to User Control Panel > Profile > Edit signature") }}

    - Paste this into your signature: + {{ _("Paste this into your signature:") }}

    - Click next so we can check it. + {{ _("Click next so we can check it.") }}

    - Don't worry, you can remove it after this is done. + {{ _("Don't worry, you can remove it after this is done.") }}

    - +
    diff --git a/app/templates/users/delete.html b/app/templates/users/delete.html index 2ff5031..3f9f3cb 100644 --- a/app/templates/users/delete.html +++ b/app/templates/users/delete.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} - Delete user {{ user.username }} + {{ _("Delete user %(username)s", username=user.username) }} {% endblock %} {% block content %} @@ -10,7 +10,7 @@

    {{ self.title() }}

    -

    Deleting is permanent

    +

    {{ _("Deleting is permanent") }}

    {% if can_delete %}

    @@ -26,16 +26,18 @@

    {% endif %} - Cancel + + {{ _("Cancel") }} + {% if not can_delete and current_user.rank.atLeast(current_user.rank.ADMIN) %} - + {% endif %}
    diff --git a/app/templates/users/forgot_password.html b/app/templates/users/forgot_password.html index 852acae..c260134 100644 --- a/app/templates/users/forgot_password.html +++ b/app/templates/users/forgot_password.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block title %} -Request Password Reset +{{ _("Request Password Reset") }} {% endblock %} {% block content %} {% from "macros/forms.html" import render_field, render_checkbox_field, render_submit_field %}
    -

    {{ _("Request Password Reset") }}

    +

    {{ self.title() }}

    {{ form.hidden_tag() }} diff --git a/app/templates/users/forums_no_such_user.html b/app/templates/users/forums_no_such_user.html index 8f98b2b..a2604af 100644 --- a/app/templates/users/forums_no_such_user.html +++ b/app/templates/users/forums_no_such_user.html @@ -15,7 +15,9 @@

    {% if not current_user.is_authenticated %} - Claim Account + + {{ _("Claim Account") }} + {% endif %} {% endblock %} diff --git a/app/templates/users/login.html b/app/templates/users/login.html index f44bf7a..a0f4969 100644 --- a/app/templates/users/login.html +++ b/app/templates/users/login.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} - Sign in + {{ _("Sign in") }} {% endblock %} {% block container %} @@ -10,7 +10,7 @@ {{ form.hidden_tag() }} -

    Sign in

    +

    {{ self.title() }}

    {{ render_field(form.username, tabindex=110, label_visible=False, placeholder=_("Username or email")) }} {{ render_field(form.password, tabindex=120, label_visible=False, placeholder=_("Password")) }} diff --git a/app/templates/users/profile.html b/app/templates/users/profile.html index ec2174f..dc2f430 100644 --- a/app/templates/users/profile.html +++ b/app/templates/users/profile.html @@ -8,7 +8,7 @@
    - Profile picture + {{ _('Profile picture') }}
    {% if user.can_see_edit_profile(current_user) %} @@ -117,9 +117,9 @@ {% if not current_user.is_authenticated and user.rank == user.rank.NOT_JOINED and user.forums_username %}
    Claim + href="{{ url_for('users.claim_forums', username=user.forums_username) }}">{{ _("Claim") }} - Is this you? Claim your account now! + {{ _("Is this you? Claim your account now!") }}
    {% else %}
    @@ -166,13 +166,13 @@ - Create package + {{ _("Create package") }} {% endif %} {% if current_user == user or (current_user.is_authenticated and current_user.rank.atLeast(current_user.rank.EDITOR)) %} - View list of tags + {{ _("View list of tags") }} {% endif %}

    {{ _("Packages") }}

    diff --git a/app/templates/users/profile_edit.html b/app/templates/users/profile_edit.html index 5f31e6e..6702072 100644 --- a/app/templates/users/profile_edit.html +++ b/app/templates/users/profile_edit.html @@ -1,7 +1,7 @@ {% extends "users/settings_base.html" %} {% block title %} - {{ _("Edit Profile | %(username)s", username=user.username) }} + {{ _("Edit Profile - %(username)s", username=user.username) }} {% endblock %} {% block pane %} diff --git a/app/templates/users/register.html b/app/templates/users/register.html index 31696c5..89b1dfe 100644 --- a/app/templates/users/register.html +++ b/app/templates/users/register.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block title %} -Register +{{ _("Register") }} {% endblock %} {% block content %} {% from "macros/forms.html" import render_field, render_checkbox_field, render_submit_field %}
    -

    {{ _("Register") }}

    +

    {{ self.title() }}

    {{ form.hidden_tag() }} @@ -27,8 +27,8 @@ Register {{ render_field(form.password, hint=_("Must be at least 8 characters long.")) }}

    - Password suggestion - (Why?): + {{ _("Password suggestion") }} + ({{ _("Why?") }}): {{ suggested_password }}

    diff --git a/app/templates/users/settings_email.html b/app/templates/users/settings_email.html index 55ebf80..c0d7fbb 100644 --- a/app/templates/users/settings_email.html +++ b/app/templates/users/settings_email.html @@ -1,7 +1,7 @@ {% extends "users/settings_base.html" %} {% block title %} - {{ _("Email and Notifications | %(username)s", username=user.username) }} + {{ _("Email and Notifications - %(username)s", username=user.username) }} {% endblock %} {% block pane %} @@ -11,7 +11,7 @@ {{ form.hidden_tag() }} -

    Email Address

    +

    {{ _("Email Address") }}

    {{ render_field(form.email, tabindex=100) }} @@ -26,7 +26,7 @@

    {% endif %} -

    Notification Settings

    +

    {{ _("Notification Settings") }}

    {% if is_new %}

    @@ -35,15 +35,15 @@ {% endif %}

    - Configure whether certain types of notifications are sent immediately, or as part of a daily digest.
    + {{ _("Configure whether certain types of notifications are sent immediately, or as part of a daily digest.") }}

    - - - - + + + + {% for type in types %} diff --git a/app/templates/users/unsubscribe.html b/app/templates/users/unsubscribe.html index ba1b86b..a840078 100644 --- a/app/templates/users/unsubscribe.html +++ b/app/templates/users/unsubscribe.html @@ -36,28 +36,29 @@ {% if user %}

    - Unsubscribing may prevent you from being able to sign into the - account '{{ user.display_name }}'. + + {{ _("Unsubscribing may prevent you from being able to sign into the account '%(display_name)s'", display_name=user.display_name) }} + .

    - ContentDB will no longer be able to send "forget password" and other essential system emails. - Consider editing your email notification preferences instead. + {{ _("ContentDB will no longer be able to send "forget password" and other essential system emails. + Consider editing your email notification preferences instead.") }}

    {% else %}

    - You won't be able to use this email with ContentDB anymore. + {{ _("You won't be able to use this email with ContentDB anymore.") }}

    {% endif %}
    {% if user %} - Edit Notification Preferences + {{ _("Edit Notification Preferences") }} {% endif %} - +
    {% endif %}
    EventDescriptionImmediatelyIn digest{{ _("Event") }}{{ _("Description") }}{{ _("Immediately") }}{{ _("In digest") }}