diff --git a/docs/translating/internationalization.md b/docs/translating/internationalization.md index 0d1a65ee52..d3bf441340 100644 --- a/docs/translating/internationalization.md +++ b/docs/translating/internationalization.md @@ -258,12 +258,11 @@ If you are passing a translated string to a Handlebars partial, you can use: The syntax for block strings or strings containing variables is: ``` -{{#tr context}} +{{#tr}} Block of English text. {{/tr}} -var context = {'variable': 'variable value'}; -{{#tr context}} +{{#tr}} Block of English text with a {variable}. {{/tr}} ``` diff --git a/static/js/templates.js b/static/js/templates.js index c69ea242b4..2842790eff 100644 --- a/static/js/templates.js +++ b/static/js/templates.js @@ -59,25 +59,22 @@ Handlebars.registerHelper("t", (message) => { return intl.formatMessage(descriptor); }); -Handlebars.registerHelper("tr", function (context, options) { +Handlebars.registerHelper("tr", function (options) { // Marks a block for translation. // Example usage 1: - // {{#tr context}} + // {{#tr}} //

some English text

// {{/tr}} // // Example usage 2: - // {{#tr context}} - //

This {variable} will get value from context

+ // {{#tr}} + //

This {variable} will get value from the current context

// {{/tr}} // - // Notes: - // 1. `context` is very important. It can be `this` or an - // object or key of the current context. - // 2. Use `{` and `}` instead of `{{` and `}}` to declare - // expressions. + // Note: use `{` and `}` instead of `{{` and `}}` to declare + // variables. const message = options - .fn(context) + .fn(this) .trim() .split("\n") .map((s) => s.trim()) @@ -92,7 +89,7 @@ Handlebars.registerHelper("tr", function (context, options) { ]), ), ...Object.fromEntries( - Object.entries(context ?? {}).map(([key, value]) => [ + Object.entries(this ?? {}).map(([key, value]) => [ key, Handlebars.Utils.escapeExpression(value), ]), diff --git a/static/templates/actions_popover_content.hbs b/static/templates/actions_popover_content.hbs index cb456b6584..92963ee90a 100644 --- a/static/templates/actions_popover_content.hbs +++ b/static/templates/actions_popover_content.hbs @@ -64,7 +64,7 @@
  • - {{#tr this}}Mute the topic {topic}{{/tr}} (M) + {{#tr}}Mute the topic {topic}{{/tr}} (M)
    • {{/if}} @@ -73,7 +73,7 @@
  • - {{#tr this}}Unmute the topic {topic}{{/tr}} + {{#tr}}Unmute the topic {topic}{{/tr}}
    • {{/if}} @@ -82,7 +82,7 @@
  • - {{#tr this}}Add emoji reaction{{/tr}} + {{#tr}}Add emoji reaction{{/tr}}
    • {{/if}} diff --git a/static/templates/all_messages_sidebar_actions.hbs b/static/templates/all_messages_sidebar_actions.hbs index 0e7b172d67..75a254bb56 100644 --- a/static/templates/all_messages_sidebar_actions.hbs +++ b/static/templates/all_messages_sidebar_actions.hbs @@ -4,7 +4,7 @@ {{! tabindex="0" Makes anchor tag focusable. Needed for keyboard support. }} - {{#tr this}}Mark all messages as read{{/tr}} + {{#tr}}Mark all messages as read{{/tr}} diff --git a/static/templates/announce_stream_docs.hbs b/static/templates/announce_stream_docs.hbs index f456d79e40..d3b3867457 100644 --- a/static/templates/announce_stream_docs.hbs +++ b/static/templates/announce_stream_docs.hbs @@ -1,7 +1,7 @@ {{! Explanation of what "announce stream" does when creating a stream }}
    - {{#tr this}} + {{#tr}}

    Stream will be announced in #{notifications_stream}.

    {{/tr}}

    {{t 'Organization administrators can change this in the organization settings.' }}

    diff --git a/static/templates/archive_recipient_row.hbs b/static/templates/archive_recipient_row.hbs index 3a63c24585..602c37496b 100644 --- a/static/templates/archive_recipient_row.hbs +++ b/static/templates/archive_recipient_row.hbs @@ -5,7 +5,7 @@ + title="{{#tr}}Narrow to stream "{display_recipient}"{{/tr}}"> {{display_recipient}} {{! topic stuff }} @@ -13,7 +13,7 @@ {{! topic link }} + title="{{#tr}}Narrow to stream "{display_recipient}", topic "{topic}"{{/tr}}"> {{topic}} diff --git a/static/templates/compose_all_everyone.hbs b/static/templates/compose_all_everyone.hbs index 5d282b485e..0a207651c2 100644 --- a/static/templates/compose_all_everyone.hbs +++ b/static/templates/compose_all_everyone.hbs @@ -1,6 +1,6 @@
    - {{#tr this}} + {{#tr}} Are you sure you want to mention all {count} people in this stream?
    This will send email and mobile push notifications to most of those {count} users. diff --git a/static/templates/compose_announce.hbs b/static/templates/compose_announce.hbs index 7dd0a4a1fa..79d1e851ff 100644 --- a/static/templates/compose_announce.hbs +++ b/static/templates/compose_announce.hbs @@ -1,6 +1,6 @@
    - {{#tr this}} + {{#tr}} This stream is reserved for announcements.
    Are you sure you want to message all {count} people in this stream? diff --git a/static/templates/compose_invite_users.hbs b/static/templates/compose_invite_users.hbs index 85f34565e9..0042ca899b 100644 --- a/static/templates/compose_invite_users.hbs +++ b/static/templates/compose_invite_users.hbs @@ -1,10 +1,10 @@
    {{#if can_subscribe_other_users}} -

    {{#tr this}}{name} is not subscribed to this stream. They will not be notified unless you subscribe them.{{/tr}}

    +

    {{#tr}}{name} is not subscribed to this stream. They will not be notified unless you subscribe them.{{/tr}}

    {{else}} -

    {{#tr this}}{name} is not subscribed to this stream. They will not be notified if you mention them.{{/tr}}

    +

    {{#tr}}{name} is not subscribed to this stream. They will not be notified if you mention them.{{/tr}}

    {{/if}}
    diff --git a/static/templates/compose_not_subscribed.hbs b/static/templates/compose_not_subscribed.hbs index 255755070b..484475bbdc 100644 --- a/static/templates/compose_not_subscribed.hbs +++ b/static/templates/compose_not_subscribed.hbs @@ -1,6 +1,6 @@

    - {{#tr this}} + {{#tr}} You're not subscribed to this stream. You will not be notified if other users reply to your message. {{/tr}}

    diff --git a/static/templates/compose_private_stream_alert.hbs b/static/templates/compose_private_stream_alert.hbs index cef115efe4..4e663abf44 100644 --- a/static/templates/compose_private_stream_alert.hbs +++ b/static/templates/compose_private_stream_alert.hbs @@ -1,5 +1,5 @@
    - {{#tr this}}Warning: {stream_name} is a private stream.{{/tr}} + {{#tr}}Warning: {stream_name} is a private stream.{{/tr}}
    diff --git a/static/templates/confirm_delete_user.hbs b/static/templates/confirm_delete_user.hbs index 89a3821947..119d452f68 100644 --- a/static/templates/confirm_delete_user.hbs +++ b/static/templates/confirm_delete_user.hbs @@ -1,5 +1,5 @@

    - {{#tr this}} + {{#tr}} Are you sure you want to delete {group_name}? {{/tr}}

    diff --git a/static/templates/confirm_delete_user_avatar.hbs b/static/templates/confirm_delete_user_avatar.hbs index 26ca53a1de..030cad606b 100644 --- a/static/templates/confirm_delete_user_avatar.hbs +++ b/static/templates/confirm_delete_user_avatar.hbs @@ -1,5 +1,5 @@

    - {{#tr this}} + {{#tr}} Are you sure you want to delete your profile picture? {{/tr}}

    diff --git a/static/templates/confirm_unstar_all_messages.hbs b/static/templates/confirm_unstar_all_messages.hbs index 3dacce78bc..b13ffa6933 100644 --- a/static/templates/confirm_unstar_all_messages.hbs +++ b/static/templates/confirm_unstar_all_messages.hbs @@ -1,5 +1,5 @@

    - {{#tr this}} + {{#tr}} Would you like to unstar all starred messages? This action cannot be undone. {{/tr}}

    diff --git a/static/templates/confirm_unstar_all_messages_in_topic.hbs b/static/templates/confirm_unstar_all_messages_in_topic.hbs index 923e8219b8..c33790b631 100644 --- a/static/templates/confirm_unstar_all_messages_in_topic.hbs +++ b/static/templates/confirm_unstar_all_messages_in_topic.hbs @@ -1,5 +1,5 @@

    - {{#tr this}} + {{#tr}} Are you sure you want to unstar all messages in topic {topic}? This action cannot be undone. {{/tr}}

    diff --git a/static/templates/delete_topic_modal.hbs b/static/templates/delete_topic_modal.hbs index 2aa178f6c4..30c565b5d7 100644 --- a/static/templates/delete_topic_modal.hbs +++ b/static/templates/delete_topic_modal.hbs @@ -7,7 +7,7 @@
    -

    {{#tr this}}Are you sure you want to permanently delete {topic_name}?{{/tr}}

    +

    {{#tr}}Are you sure you want to permanently delete {topic_name}?{{/tr}}

    {{t "Deleting a topic will immediately remove it and its messages for everyone. Other users may find this confusing, especially if they had received an email or push notification related to the deleted messages." }}

    diff --git a/static/templates/draft.hbs b/static/templates/draft.hbs index ac4f2e6319..6706e3afe3 100644 --- a/static/templates/draft.hbs +++ b/static/templates/draft.hbs @@ -20,7 +20,7 @@
    - {{#tr this}}You and {recipients}{{/tr}} + {{#tr}}You and {recipients}{{/tr}}
    {{ time_stamp }}
    diff --git a/static/templates/draft_table_body.hbs b/static/templates/draft_table_body.hbs index e573f6e0d9..38689e4b9c 100644 --- a/static/templates/draft_table_body.hbs +++ b/static/templates/draft_table_body.hbs @@ -7,7 +7,7 @@ ×
    - {{#tr this}} Drafts older than {draft_lifetime} days are automatically removed. {{/tr}} + {{#tr}} Drafts older than {draft_lifetime} days are automatically removed. {{/tr}}
    {{t "Pro tip: You can use 'd' to open your drafts."}} diff --git a/static/templates/edited_notice.hbs b/static/templates/edited_notice.hbs index 6eb7c43527..fcc2f08bad 100644 --- a/static/templates/edited_notice.hbs +++ b/static/templates/edited_notice.hbs @@ -1,9 +1,9 @@ {{#if msg/local_edit_timestamp}} -
    +
    ({{t "SAVING" }})
    {{else}} -
    +
    ({{t "EDITED" }})
    {{/if}} diff --git a/static/templates/invitation_failed_error.hbs b/static/templates/invitation_failed_error.hbs index 6fd53b731b..3aea0d82cf 100644 --- a/static/templates/invitation_failed_error.hbs +++ b/static/templates/invitation_failed_error.hbs @@ -7,7 +7,7 @@ {{#if is_invitee_deactivated}} {{#if is_admin}}

    - {{#tr this}} + {{#tr}} You can reactivate deactivated users from organization settings. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} diff --git a/static/templates/message_controls.hbs b/static/templates/message_controls.hbs index 04c038f7ae..8f0170930b 100644 --- a/static/templates/message_controls.hbs +++ b/static/templates/message_controls.hbs @@ -5,13 +5,13 @@ {{#unless msg/sent_by_me}}

    - +
    {{/unless}} {{#unless msg/locally_echoed}}
    - +
    {{/unless}} @@ -22,7 +22,7 @@ {{#unless msg/locally_echoed}}
    - +
    {{/unless}} diff --git a/static/templates/message_edit_form.hbs b/static/templates/message_edit_form.hbs index 13a6166674..fe94ba52dc 100644 --- a/static/templates/message_edit_form.hbs +++ b/static/templates/message_edit_form.hbs @@ -82,7 +82,7 @@ {{#if has_been_editable}}
    - +
    {{/if}} diff --git a/static/templates/move_topic_to_stream.hbs b/static/templates/move_topic_to_stream.hbs index 81c9a6ef16..5757231d1c 100644 --- a/static/templates/move_topic_to_stream.hbs +++ b/static/templates/move_topic_to_stream.hbs @@ -4,7 +4,7 @@

    {{t "Move topic" }}

    -

    {{#tr this}}Move all messages in {topic_name}{{/tr}} to:

    +

    {{#tr}}Move all messages in {topic_name}{{/tr}} to:

    × diff --git a/static/templates/playground_links_popover_content.hbs b/static/templates/playground_links_popover_content.hbs index df93dcc12a..a9f1a45c64 100644 --- a/static/templates/playground_links_popover_content.hbs +++ b/static/templates/playground_links_popover_content.hbs @@ -3,7 +3,7 @@ {{#each playground_info}}
  • - {{#tr this}} + {{#tr}} View in {name} {{/tr}} diff --git a/static/templates/recipient_row.hbs b/static/templates/recipient_row.hbs index 7f99a43c1b..dced311ea1 100644 --- a/static/templates/recipient_row.hbs +++ b/static/templates/recipient_row.hbs @@ -6,7 +6,7 @@ + title="{{#tr}}Narrow to stream "{display_recipient}"{{/tr}}"> {{! invite only lock }} {{#if invite_only}} @@ -21,7 +21,7 @@ {{! topic link }} + title="{{#tr}}Narrow to stream "{display_recipient}", topic "{topic}"{{/tr}}"> {{#if use_match_properties}} {{{match_topic}}} {{else}} @@ -62,8 +62,8 @@
    - {{#tr this}}You and {display_reply_to}{{/tr}} + title="{{#tr}}Narrow to your private messages with {display_reply_to}{{/tr}}"> + {{#tr}}You and {display_reply_to}{{/tr}} {{{date}}} diff --git a/static/templates/settings/account_settings.hbs b/static/templates/settings/account_settings.hbs index 6e83e7ddcc..ed5ef03594 100644 --- a/static/templates/settings/account_settings.hbs +++ b/static/templates/settings/account_settings.hbs @@ -172,7 +172,7 @@

    {{t "Deactivate your account" }}

    -

    {{#tr this}}By deactivating your account, you will be logged out immediately.{{/tr}}

    +

    {{#tr}}By deactivating your account, you will be logged out immediately.{{/tr}}

    {{t "Note that any bots that you maintain will be disabled." }}

    @@ -191,7 +191,7 @@

    - {{#tr this}} + {{#tr}} An API key can be used to programmatically access a Zulip account. Anyone with access to your API key has the ability to read your messages, send messages on your behalf, and otherwise impersonate you on Zulip, so you should diff --git a/static/templates/settings/bot_settings.hbs b/static/templates/settings/bot_settings.hbs index 85180b59af..f1cedc8ee0 100644 --- a/static/templates/settings/bot_settings.hbs +++ b/static/templates/settings/bot_settings.hbs @@ -2,7 +2,7 @@

    {{#unless page_params.is_guest}}
    - {{#tr this}} + {{#tr}} Looking for our integrations or API documentation? {{#*inline "z-integrations"}}{{> @partial-block}}{{/inline}} {{#*inline "z-api"}}{{> @partial-block}}{{/inline}} diff --git a/static/templates/settings/data_exports_admin.hbs b/static/templates/settings/data_exports_admin.hbs index 968bcb288c..7c6129e059 100644 --- a/static/templates/settings/data_exports_admin.hbs +++ b/static/templates/settings/data_exports_admin.hbs @@ -8,7 +8,7 @@ {{t 'Depending on the size of your organization, an export can take anywhere from seconds to an hour.' }}

    - {{#tr this}} + {{#tr}} Click here to learn about exporting private streams and messages. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} diff --git a/static/templates/settings/deactivation_user_modal.hbs b/static/templates/settings/deactivation_user_modal.hbs index ac606a6010..a1c6826d28 100644 --- a/static/templates/settings/deactivation_user_modal.hbs +++ b/static/templates/settings/deactivation_user_modal.hbs @@ -5,7 +5,7 @@

    - {{#tr this}} + {{#tr}} By deactivating , they will be logged out immediately. {{#*inline "z-user"}} <>{{/inline}} {{/tr}} diff --git a/static/templates/settings/default_streams_list_admin.hbs b/static/templates/settings/default_streams_list_admin.hbs index a1c1802493..e16304c68d 100644 --- a/static/templates/settings/default_streams_list_admin.hbs +++ b/static/templates/settings/default_streams_list_admin.hbs @@ -1,6 +1,6 @@

    -

    {{#tr this}}Configure the default streams new users are subscribed to when joining your organization.{{/tr}}

    +

    {{#tr}}Configure the default streams new users are subscribed to when joining your organization.{{/tr}}

    {{#if is_admin}} diff --git a/static/templates/settings/emoji_settings_admin.hbs b/static/templates/settings/emoji_settings_admin.hbs index 12f9bb4aab..53ee7f3004 100644 --- a/static/templates/settings/emoji_settings_admin.hbs +++ b/static/templates/settings/emoji_settings_admin.hbs @@ -3,7 +3,7 @@ {{> emoji_settings_tip}}

    - {{#tr this}}Add extra emoji for members of the {realm_name} organization.{{/tr}} + {{#tr}}Add extra emoji for members of the {realm_name} organization.{{/tr}}

    diff --git a/static/templates/settings/linkifier_settings_admin.hbs b/static/templates/settings/linkifier_settings_admin.hbs index f1eb8098fc..a573b0c705 100644 --- a/static/templates/settings/linkifier_settings_admin.hbs +++ b/static/templates/settings/linkifier_settings_admin.hbs @@ -2,7 +2,7 @@

    - {{#tr this}} + {{#tr}} Configure regular expression patterns that will be automatically linkified when used in Zulip message bodies or topics. For example to automatically linkify commit IDs and @@ -23,7 +23,7 @@

    • - {{#tr this}} + {{#tr}} Or, to automatically linkify GitHub's org/repo#1234 syntax: {{/tr}}

    @@ -35,7 +35,7 @@

    - {{#tr this}} + {{#tr}} More details are available in the Help Center article. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} diff --git a/static/templates/settings/resend_invite_modal.hbs b/static/templates/settings/resend_invite_modal.hbs index 09356d0681..ccb87bd3b6 100644 --- a/static/templates/settings/resend_invite_modal.hbs +++ b/static/templates/settings/resend_invite_modal.hbs @@ -2,7 +2,7 @@

    - {{#tr this}} + {{#tr}} Resend invitation to {{#*inline "z-email"}}{{/inline}} {{/tr}} @@ -10,7 +10,7 @@

    - {{#tr this}} + {{#tr}} Are you sure you want to resend the invitation to ? {{#*inline "z-email"}}{{/inline}} {{/tr}} diff --git a/static/templates/settings/revoke_invite_modal.hbs b/static/templates/settings/revoke_invite_modal.hbs index 2adc66c6b1..c1a759b262 100644 --- a/static/templates/settings/revoke_invite_modal.hbs +++ b/static/templates/settings/revoke_invite_modal.hbs @@ -2,16 +2,16 @@

    {{#if is_multiuse}} -

    {{#tr this}}Revoke invitation link{{/tr}}

    +

    {{#tr}}Revoke invitation link{{/tr}}

    {{else}} -

    {{#tr this}}Revoke invitation to {email}{{/tr}}

    +

    {{#tr}}Revoke invitation to {email}{{/tr}}

    {{/if}}
    {{#if is_multiuse}} -

    {{#tr this}}Are you sure you want to revoke this invitation link created by {referred_by}?{{/tr}}

    +

    {{#tr}}Are you sure you want to revoke this invitation link created by {referred_by}?{{/tr}}

    {{else}} -

    {{#tr this}}Are you sure you want to revoke the invitation to {email}?{{/tr}}

    +

    {{#tr}}Are you sure you want to revoke the invitation to {email}?{{/tr}}

    {{/if}}
    diff --git a/static/templates/settings/upload_space_stats.hbs b/static/templates/settings/upload_space_stats.hbs index b0122a66fc..6907634346 100644 --- a/static/templates/settings/upload_space_stats.hbs +++ b/static/templates/settings/upload_space_stats.hbs @@ -1,7 +1,7 @@ - {{#tr this}}Organization using {percent_used}% of {upload_quota}.{{/tr}} + {{#tr}}Organization using {percent_used}% of {upload_quota}.{{/tr}} {{#if show_upgrade_message}} - {{#tr this}} + {{#tr}} Upgrade for more space. {{#*inline "z-link"}}{{> @partial-block }}{{/inline}} {{/tr}} diff --git a/static/templates/starred_messages_sidebar_actions.hbs b/static/templates/starred_messages_sidebar_actions.hbs index 14ce5d6e5f..d35f8dcab4 100644 --- a/static/templates/starred_messages_sidebar_actions.hbs +++ b/static/templates/starred_messages_sidebar_actions.hbs @@ -5,7 +5,7 @@
  • - {{#tr this}}Unstar all messages{{/tr}} + {{#tr}}Unstar all messages{{/tr}}
    • {{/if}} @@ -13,10 +13,10 @@ {{#if starred_message_counts}} - {{#tr this}}Hide starred message count{{/tr}} + {{#tr}}Hide starred message count{{/tr}} {{else}} - {{#tr this}}Show starred message count{{/tr}} + {{#tr}}Show starred message count{{/tr}} {{/if}} diff --git a/static/templates/stream_creation_form.hbs b/static/templates/stream_creation_form.hbs index cbef09ce19..8a21a1bfe9 100644 --- a/static/templates/stream_creation_form.hbs +++ b/static/templates/stream_creation_form.hbs @@ -24,7 +24,7 @@ {{t "Stream permissions" }}
    - {{#tr this}} + {{#tr}} These settings are explained in detail in the help center. {{#*inline "z-link"}}{{> @partial-block }}{{/inline}} {{/tr}} diff --git a/static/templates/stream_settings_checkbox.hbs b/static/templates/stream_settings_checkbox.hbs index e885778977..f3ed544ffb 100644 --- a/static/templates/stream_settings_checkbox.hbs +++ b/static/templates/stream_settings_checkbox.hbs @@ -14,7 +14,7 @@ {{!-- Tooltips for settings --}} {{#if (eq setting_name "is_muted")}}

    - {{#tr this}} + {{#tr}} Muted streams don't show up in "All messages" or generate notifications unless you are mentioned. {{/tr}}

    diff --git a/static/templates/subscription_invites_warning_modal.hbs b/static/templates/subscription_invites_warning_modal.hbs index 76a640b4a1..e11f5a227f 100644 --- a/static/templates/subscription_invites_warning_modal.hbs +++ b/static/templates/subscription_invites_warning_modal.hbs @@ -5,11 +5,11 @@

    {{t "Large number of subscribers" }}

    -

    {{#tr this}}Are you sure you want to create stream ''''{stream_name}'''' and subscribe {count} users to it?{{/tr}}

    +

    {{#tr}}Are you sure you want to create stream ''''{stream_name}'''' and subscribe {count} users to it?{{/tr}}

    - +
    diff --git a/static/templates/subscription_table_body.hbs b/static/templates/subscription_table_body.hbs index b756f79e80..4587c500c5 100644 --- a/static/templates/subscription_table_body.hbs +++ b/static/templates/subscription_table_body.hbs @@ -37,7 +37,7 @@ {{#if can_create_streams}} - {{#tr this}} + {{#tr}} First time? Read our guidelines for creating and naming streams. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} diff --git a/static/templates/subscription_type.hbs b/static/templates/subscription_type.hbs index f7eb5c7d2b..61452cf39c 100644 --- a/static/templates/subscription_type.hbs +++ b/static/templates/subscription_type.hbs @@ -1,5 +1,5 @@ {{#if invite_only}} - {{#tr this}} + {{#tr}} This is a private stream. Only people who have been invited can access its content, but any member of the stream can invite others. {{#*inline "z-icon"}}{{/inline}} {{/tr}} @@ -7,12 +7,12 @@ {{else}}{{t 'New members can only see messages sent after they join.' }} {{/if}} {{else if is_web_public}} - {{#tr this}} + {{#tr}} This is a web public stream. Any member of the organization can join without an invitation and anyone on the internet can read the content published. {{#*inline "z-icon"}}{{/inline}} {{/tr}} {{else}} - {{#tr this}} + {{#tr}} This is a public stream. Any member of the organization can join without an invitation. {{#*inline "z-icon"}}{{/inline}} {{/tr}} diff --git a/static/templates/topic_muted.hbs b/static/templates/topic_muted.hbs index a9e372f9fc..da8fbb83fc 100644 --- a/static/templates/topic_muted.hbs +++ b/static/templates/topic_muted.hbs @@ -1,4 +1,4 @@ -{{#tr this}} +{{#tr}} You have muted . {{#*inline "z-stream-topic"}} > {{/inline}} {{/tr}} diff --git a/static/templates/topic_sidebar_actions.hbs b/static/templates/topic_sidebar_actions.hbs index ce8893d00a..ff68d4cb2f 100644 --- a/static/templates/topic_sidebar_actions.hbs +++ b/static/templates/topic_sidebar_actions.hbs @@ -30,7 +30,7 @@
  • - {{#tr this}}Unstar all messages in topic{{/tr}} + {{#tr}}Unstar all messages in topic{{/tr}}
    • {{/if}} @@ -44,7 +44,7 @@ {{#if is_realm_admin}} -
    {{#tr this}}ADMIN ACTIONS{{/tr}}
    +
    {{#tr}}ADMIN ACTIONS{{/tr}}
  • diff --git a/static/templates/typing_notification.hbs b/static/templates/typing_notification.hbs index c1fcb22897..a92af25dca 100644 --- a/static/templates/typing_notification.hbs +++ b/static/templates/typing_notification.hbs @@ -1 +1 @@ -
  • {{#tr this}}{full_name} is typing…{{/tr}}
    • +
  • {{#tr}}{full_name} is typing…{{/tr}}
    • diff --git a/static/templates/user_groups_admin.hbs b/static/templates/user_groups_admin.hbs index f7c0558a15..f5de17ca5a 100644 --- a/static/templates/user_groups_admin.hbs +++ b/static/templates/user_groups_admin.hbs @@ -9,7 +9,7 @@ {{#unless is_guest}}

    - {{#tr this}} + {{#tr}} User groups allow you to mention multiple users at once. When you mention a user group, everyone in the group is notified as if they were individually mentioned. {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} diff --git a/static/templates/user_info_popover_content.hbs b/static/templates/user_info_popover_content.hbs index 76814701be..c670596b89 100644 --- a/static/templates/user_info_popover_content.hbs +++ b/static/templates/user_info_popover_content.hbs @@ -24,26 +24,26 @@ {{/if}} {{else}} -

  • {{#tr this}}(This user has been deactivated){{/tr}}
    • +
  • {{#tr}}(This user has been deactivated){{/tr}}
    • {{/if}} {{#if user_time}} -
  • {{ user_time }} {{#tr this}}Local time{{/tr}}
    • +
  • {{ user_time }} {{#tr}}Local time{{/tr}}
    • {{/if}} {{#if is_bot}} {{#if bot_owner}} -
  • {{#tr this}}Owner{{/tr}}: +
  • {{#tr}}Owner{{/tr}}:
    • {{else}} {{#if is_cross_realm_bot}} -
  • {{#tr this}}System bot{{/tr}}
    • +
  • {{#tr}}System bot{{/tr}}
    • {{else}} -
  • {{#tr this}}Bot{{/tr}}
    • +
  • {{#tr}}Bot{{/tr}}
    • {{/if}} {{/if}} {{else}} @@ -56,14 +56,14 @@ {{#if can_set_away}}
  • - {{#tr this}}Set yourself as unavailable{{/tr}} + {{#tr}}Set yourself as unavailable{{/tr}}
    • {{/if}} {{#if can_revoke_away}}
  • - {{#tr this}}Set yourself as active{{/tr}} + {{#tr}}Set yourself as active{{/tr}}
    • {{/if}} @@ -71,9 +71,9 @@ {{#if status_text}} - {{#tr this}}Edit status message{{/tr}} + {{#tr}}Edit status message{{/tr}} {{else}} - {{#tr this}}Set a status message{{/tr}} + {{#tr}}Set a status message{{/tr}} {{/if}} @@ -84,7 +84,7 @@ {{/if}} @@ -94,9 +94,9 @@
    • @@ -105,7 +105,7 @@ {{#unless is_me}}
  • - {{#tr this}}Send private message{{/tr}} {{#if is_sender_popover}}(R){{/if}} + {{#tr}}Send private message{{/tr}} {{#if is_sender_popover}}(R){{/if}}
    • {{/unless}} @@ -115,13 +115,13 @@ {{#if has_message_context}} - {{#tr this}}Reply mentioning user{{/tr}} + {{#tr}}Reply mentioning user{{/tr}} {{#if is_sender_popover}}(@){{/if}} {{else}} - {{#tr this}}Copy mention syntax{{/tr}} + {{#tr}}Copy mention syntax{{/tr}} {{#if is_sender_popover}}(@){{/if}} {{/if}} @@ -130,7 +130,7 @@ {{#if is_me}}
  • - {{#tr this}}Edit your profile{{/tr}} + {{#tr}}Edit your profile{{/tr}}
    • {{/if}} @@ -139,15 +139,15 @@ {{#if is_me}} - {{#tr this}}View private messages to myself{{/tr}} + {{#tr}}View private messages to myself{{/tr}} {{else}} - {{#tr this}}View private messages{{/tr}} + {{#tr}}View private messages{{/tr}} {{/if}}
  • - {{#tr this}}View messages sent{{/tr}} + {{#tr}}View messages sent{{/tr}}
    • diff --git a/static/templates/user_profile_modal.hbs b/static/templates/user_profile_modal.hbs index 22b02e3524..ebce236057 100644 --- a/static/templates/user_profile_modal.hbs +++ b/static/templates/user_profile_modal.hbs @@ -17,25 +17,25 @@
    {{#if show_email}}
    - {{#tr this}}Email{{/tr}} + {{#tr}}Email{{/tr}} {{email}}
    {{/if}}
    - {{#tr this}}Joined{{/tr}} + {{#tr}}Joined{{/tr}} {{date_joined}}
    - {{#tr this}}Role{{/tr}} + {{#tr}}Role{{/tr}} {{user_type}}
    - {{#tr this}}Last active{{/tr}} + {{#tr}}Last active{{/tr}} {{last_seen}}
    {{#if user_time}}
    - {{#tr this}}Local time{{/tr}} + {{#tr}}Local time{{/tr}} {{user_time}}
    {{/if}} diff --git a/zerver/management/commands/makemessages.py b/zerver/management/commands/makemessages.py index 3498fcdd03..bb70ddf20c 100644 --- a/zerver/management/commands/makemessages.py +++ b/zerver/management/commands/makemessages.py @@ -52,7 +52,7 @@ strip_whitespace_left = re.compile( ) regexes = [ - r"{{#tr .*?}}([\s\S]*?)(?:{{/tr}}|{{#\*inline )", # '.' doesn't match '\n' by default + r"{{#tr}}([\s\S]*?)(?:{{/tr}}|{{#\*inline )", # '.' doesn't match '\n' by default r'{{\s*t "(.*?)"\W*}}', r"{{\s*t '(.*?)'\W*}}", r'\(t "(.*?)"\)', diff --git a/zerver/tests/test_i18n.py b/zerver/tests/test_i18n.py index 200885e371..dc11eed640 100644 --- a/zerver/tests/test_i18n.py +++ b/zerver/tests/test_i18n.py @@ -160,8 +160,8 @@ class FrontendRegexTestCase(ZulipTestCase): data = [ ( - "{{#tr context}}english text with __variable__{{/tr}}{{/tr}}", - "english text with __variable__", + "{{#tr}}english text with {variable}{{/tr}}{{/tr}}", + "english text with {variable}", ), ('{{t "english text" }}, "extra"}}', "english text"), ("{{t 'english text' }}, 'extra'}}", "english text"),