{{username}} {{description}}" - invited_to_topic: "{{username}} {{description}}" - invitee_accepted: "{{username}} accepted your invitation" - moved_post: "{{username}} moved {{description}}" - linked: "{{username}} {{description}}" - granted_badge: "Earned '{{description}}'" - topic_reminder: "{{username}} {{description}}" - watching_first_post: "New Topic {{description}}" - membership_request_accepted: "Membership accepted in '{{group_name}}'" - membership_request_consolidated: "{{count}} open membership requests for '{{group_name}}'" + one: "liked %{count} of your posts" + other: "liked %{count} of your posts" + liked_consolidated: "%{username} %{description}" + private_message: "%{username} %{description}" + invited_to_private_message: "
%{username} %{description}" + invited_to_topic: "%{username} %{description}" + invitee_accepted: "%{username} accepted your invitation" + moved_post: "%{username} moved %{description}" + linked: "%{username} %{description}" + granted_badge: "Earned '%{description}'" + topic_reminder: "%{username} %{description}" + watching_first_post: "New Topic %{description}" + membership_request_accepted: "Membership accepted in '%{group_name}'" + membership_request_consolidated: "%{count} open membership requests for '%{group_name}'" group_message_summary: - one: "{{count}} message in your {{group_name}} inbox" - other: "{{count}} messages in your {{group_name}} inbox" + one: "%{count} message in your %{group_name} inbox" + other: "%{count} messages in your %{group_name} inbox" popup: - mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}' - group_mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}' - quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}' - replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}' - posted: '{{username}} posted in "{{topic}}" - {{site_title}}' - private_message: '{{username}} sent you a personal message in "{{topic}}" - {{site_title}}' - linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}' - watching_first_post: '{{username}} created a new topic "{{topic}}" - {{site_title}}' + mentioned: '%{username} mentioned you in "%{topic}" - %{site_title}' + group_mentioned: '%{username} mentioned you in "%{topic}" - %{site_title}' + quoted: '%{username} quoted you in "%{topic}" - %{site_title}' + replied: '%{username} replied to you in "%{topic}" - %{site_title}' + posted: '%{username} posted in "%{topic}" - %{site_title}' + private_message: '%{username} sent you a personal message in "%{topic}" - %{site_title}' + linked: '%{username} linked to your post from "%{topic}" - %{site_title}' + watching_first_post: '%{username} created a new topic "%{topic}" - %{site_title}' confirm_title: "Notifications enabled - %{site_title}" confirm_body: "Success! Notifications have been enabled." - custom: "Notification from {{username}} on %{site_title}" + custom: "Notification from %{username} on %{site_title}" titles: mentioned: "mentioned" @@ -1937,9 +1937,9 @@ en: from_my_computer: "From my device" from_the_web: "From the web" remote_tip: "link to image" - remote_tip_with_attachments: "link to image or file {{authorized_extensions}}" + remote_tip_with_attachments: "link to image or file %{authorized_extensions}" local_tip: "select images from your device" - local_tip_with_attachments: "select images or files from your device {{authorized_extensions}}" + local_tip_with_attachments: "select images or files from your device %{authorized_extensions}" hint: "(you can also drag & drop into the editor to upload them)" hint_for_supported_browsers: "you can also drag and drop or paste images into the editor" uploading: "Uploading" @@ -1957,15 +1957,15 @@ en: clear_all: "Clear All" too_short: "Your search term is too short." result_count: - one: "%{count} result for{{term}}" - other: "{{count}}{{plus}} results for{{term}}" + one: "%{count} result for%{term}" + other: "%{count}%{plus} results for%{term}" title: "search topics, posts, users, or categories" full_page_title: "search topics or posts" no_results: "No results found." no_more_results: "No more results found." searching: "Searching ..." - post_format: "#{{post_number}} by {{username}}" - results_page: "Search results for '{{term}}'" + post_format: "#%{post_number} by %{username}" + results_page: "Search results for '%{term}'" more_results: "There are more results. Please narrow your search criteria." cant_find: "Can’t find what you’re looking for?" start_new_topic: "Perhaps start a new topic?" @@ -1975,9 +1975,9 @@ en: search_google_title: "Search this site" context: - user: "Search posts by @{{username}}" - category: "Search the #{{category}} category" - tag: "Search the #{{tag}} tag" + user: "Search posts by @%{username}" + category: "Search the #%{category} category" + tag: "Search the #%{tag} tag" topic: "Search this topic" private_messages: "Search messages" @@ -2057,7 +2057,7 @@ en: choose_new_category: "Choose the new category for the topics:" selected: one: "You have selected %{count} topic." - other: "You have selected {{count}} topics." + other: "You have selected %{count} topics." change_tags: "Replace Tags" append_tags: "Append Tags" choose_new_tags: "Choose new tags for these topics:" @@ -2071,7 +2071,7 @@ en: posted: "You haven't posted in any topics yet." latest: "There are no latest topics. That's sad." bookmarks: "You have no bookmarked topics yet." - category: "There are no {{category}} topics." + category: "There are no %{category} topics." top: "There are no top topics." educate: new: '
Your new topics appear here.
By default, topics are considered new and will show a new indicator if they were created in the last 2 days.
Visit your preferences to change this.
' @@ -2082,14 +2082,14 @@ en: read: "There are no more read topics." new: "There are no more new topics." unread: "There are no more unread topics." - category: "There are no more {{category}} topics." + category: "There are no more %{category} topics." top: "There are no more top topics." bookmarks: "There are no more bookmarked topics." topic: filter_to: one: "%{count} post in topic" - other: "{{count}} posts in topic" + other: "%{count} posts in topic" create: "New Topic" create_long: "Create a new Topic" open_draft: "Open Draft" @@ -2119,10 +2119,10 @@ en: unread: "unread" new_topics: one: "%{count} new topic" - other: "{{count}} new topics" + other: "%{count} new topics" unread_topics: one: "%{count} unread topic" - other: "{{count}} unread topics" + other: "%{count} unread topics" title: "Topic" invalid_access: title: "Topic is private" @@ -2136,24 +2136,24 @@ en: description: "Sorry, we couldn't find that topic. Perhaps it was removed by a moderator?" total_unread_posts: one: "you have %{count} unread post in this topic" - other: "you have {{count}} unread posts in this topic" + other: "you have %{count} unread posts in this topic" unread_posts: one: "you have %{count} unread old post in this topic" - other: "you have {{count}} unread old posts in this topic" + other: "you have %{count} unread old posts in this topic" new_posts: one: "there is %{count} new post in this topic since you last read it" - other: "there are {{count}} new posts in this topic since you last read it" + other: "there are %{count} new posts in this topic since you last read it" likes: one: "there is %{count} like in this topic" - other: "there are {{count}} likes in this topic" + other: "there are %{count} likes in this topic" back_to_list: "Back to Topic List" options: "Topic Options" show_links: "show links within this topic" toggle_information: "toggle topic details" - read_more_in_category: "Want to read more? Browse other topics in {{catLink}} or {{latestLink}}." - read_more: "Want to read more? {{catLink}} or {{latestLink}}." - group_request: "You need to request membership to the `{{name}}` group to see this topic" - group_join: "You need join the `{{name}}` group to see this topic" + read_more_in_category: "Want to read more? Browse other topics in %{catLink} or %{latestLink}." + read_more: "Want to read more? %{catLink} or %{latestLink}." + group_request: "You need to request membership to the `%{name}` group to see this topic" + group_join: "You need join the `%{name}` group to see this topic" group_request_sent: "Your group membership request has been sent. You will be informed when it's accepted." unread_indicator: "No member has read the last post of this topic yet." @@ -2171,7 +2171,7 @@ en: =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 new topic} other { {BOTH, select, true{and } false {are } other{}} # new topics} - } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}" + } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false %{latestLink} other {}}" bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}" @@ -2280,7 +2280,7 @@ en: "2_8": "You will see a count of new replies because you are tracking this category." "2_4": "You will see a count of new replies because you posted a reply to this topic." "2_2": "You will see a count of new replies because you are tracking this topic." - "2": 'You will see a count of new replies because you read this topic.' + "2": 'You will see a count of new replies because you read this topic.' "1_2": "You will be notified if someone mentions your @name or replies to you." "1": "You will be notified if someone mentions your @name or replies to you." "0_7": "You are ignoring all notifications in this category." @@ -2364,25 +2364,25 @@ en: feature_topic: title: "Feature this topic" - pin: "Make this topic appear at the top of the {{categoryLink}} category until" - confirm_pin: "You already have {{count}} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?" - unpin: "Remove this topic from the top of the {{categoryLink}} category." - unpin_until: "Remove this topic from the top of the {{categoryLink}} category or wait until %{until}." + pin: "Make this topic appear at the top of the %{categoryLink} category until" + confirm_pin: "You already have %{count} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?" + unpin: "Remove this topic from the top of the %{categoryLink} category." + unpin_until: "Remove this topic from the top of the %{categoryLink} category or wait until %{until}." pin_note: "Users can unpin the topic individually for themselves." pin_validation: "A date is required to pin this topic." - not_pinned: "There are no topics pinned in {{categoryLink}}." + not_pinned: "There are no topics pinned in %{categoryLink}." already_pinned: - one: "Topics currently pinned in {{categoryLink}}: %{count}" - other: "Topics currently pinned in {{categoryLink}}: {{count}}" + one: "Topics currently pinned in %{categoryLink}: %{count}" + other: "Topics currently pinned in %{categoryLink}: %{count}" pin_globally: "Make this topic appear at the top of all topic lists until" - confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?" + confirm_pin_globally: "You already have %{count} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?" unpin_globally: "Remove this topic from the top of all topic lists." unpin_globally_until: "Remove this topic from the top of all topic lists or wait until %{until}." global_pin_note: "Users can unpin the topic individually for themselves." not_pinned_globally: "There are no topics pinned globally." already_pinned_globally: one: "Topics currently pinned globally: %{count}" - other: "Topics currently pinned globally: {{count}}" + other: "Topics currently pinned globally: %{count}" make_banner: "Make this topic into a banner that appears at the top of all pages." remove_banner: "Remove the banner that appears at the top of all pages." banner_note: "Users can dismiss the banner by closing it. Only one topic can be bannered at any given time." @@ -2417,17 +2417,17 @@ en: to_username: "Enter the username of the person you'd like to invite. We'll send a notification with a link inviting them to this topic." email_placeholder: "name@example.com" - success_email: "We mailed out an invitation to {{emailOrUsername}}. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites." + success_email: "We mailed out an invitation to %{emailOrUsername}. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites." success_username: "We've invited that user to participate in this topic." error: "Sorry, we couldn't invite that person. Perhaps they have already been invited? (Invites are rate limited)" - success_existing_email: "A user with email {{emailOrUsername}} already exists. We've invited that user to participate in this topic." + success_existing_email: "A user with email %{emailOrUsername} already exists. We've invited that user to participate in this topic." login_reply: "Log In to Reply" filters: n_posts: one: "%{count} post" - other: "{{count}} posts" + other: "%{count} posts" cancel: "Remove filter" move_to: @@ -2443,7 +2443,7 @@ en: error: "There was an error moving posts to the new topic." instructions: one: "You are about to create a new topic and populate it with the post you've selected." - other: "You are about to create a new topic and populate it with the {{count}} posts you've selected." + other: "You are about to create a new topic and populate it with the %{count} posts you've selected." merge_topic: title: "Move to Existing Topic" @@ -2452,7 +2452,7 @@ en: radio_label: "Existing Topic" instructions: one: "Please choose the topic you'd like to move that post to." - other: "Please choose the topic you'd like to move those {{count}} posts to." + other: "Please choose the topic you'd like to move those %{count} posts to." move_to_new_message: title: "Move to New Message" @@ -2462,7 +2462,7 @@ en: participants: "Participants" instructions: one: "You are about to create a new message and populate it with the post you've selected." - other: "You are about to create a new message and populate it with the {{count}} posts you've selected." + other: "You are about to create a new message and populate it with the %{count} posts you've selected." move_to_existing_message: title: "Move to Existing Message" @@ -2471,7 +2471,7 @@ en: participants: "Participants" instructions: one: "Please choose the message you'd like to move that post to." - other: "Please choose the message you'd like to move those {{count}} posts to." + other: "Please choose the message you'd like to move those %{count} posts to." merge_posts: title: "Merge Selected Posts" @@ -2497,11 +2497,11 @@ en: error: "There was an error changing the ownership of the posts." placeholder: "username of new owner" instructions: - one: "Please choose a new owner for the post by @{{old_user}}" - other: "Please choose a new owner for the {{count}} posts by @{{old_user}}" + one: "Please choose a new owner for the post by @%{old_user}" + other: "Please choose a new owner for the %{count} posts by @%{old_user}" instructions_without_old_user: one: "Please choose a new owner for the post" - other: "Please choose a new owner for the {{count}} posts" + other: "Please choose a new owner for the %{count} posts" change_timestamp: title: "Change Timestamp..." @@ -2512,7 +2512,7 @@ en: multi_select: select: "select" - selected: "selected ({{count}})" + selected: "selected (%{count})" select_post: label: "select" title: "Add post to selection" @@ -2531,7 +2531,7 @@ en: deselect_all: deselect all description: one: You have selected %{count} post. - other: "You have selected {{count}} posts." + other: "You have selected %{count} posts." deleted_by_author: one: "(topic withdrawn by author, will be automatically deleted in %{count} hour unless flagged)" @@ -2540,13 +2540,13 @@ en: post: quote_reply: "Quote" edit_reason: "Reason: " - post_number: "post {{number}}" + post_number: "post %{number}" ignored: "Ignored content" wiki_last_edited_on: "wiki last edited on" last_edited_on: "post last edited on" reply_as_new_topic: "Reply as linked Topic" reply_as_new_private_message: "Reply as new message to the same recipients" - continue_discussion: "Continuing the discussion from {{postLink}}:" + continue_discussion: "Continuing the discussion from %{postLink}:" follow_quote: "go to the quoted post" show_full: "Show Full Post" show_hidden: "View ignored content." @@ -2558,34 +2558,34 @@ en: locked: "a staff member has locked this post from being edited" gap: one: "view %{count} hidden reply" - other: "view {{count}} hidden replies" + other: "view %{count} hidden replies" notice: - new_user: "This is the first time {{user}} has posted — let’s welcome them to our community!" - returning_user: "It’s been a while since we’ve seen {{user}} — their last post was {{time}}." + new_user: "This is the first time %{user} has posted — let’s welcome them to our community!" + returning_user: "It’s been a while since we’ve seen %{user} — their last post was %{time}." unread: "Post is unread" has_replies: - one: "{{count}} Reply" - other: "{{count}} Replies" + one: "%{count} Reply" + other: "%{count} Replies" has_likes_title: one: "%{count} person liked this post" - other: "{{count}} people liked this post" + other: "%{count} people liked this post" has_likes_title_only_you: "you liked this post" has_likes_title_you: one: "you and %{count} other person liked this post" - other: "you and {{count}} other people liked this post" + other: "you and %{count} other people liked this post" errors: create: "Sorry, there was an error creating your post. Please try again." edit: "Sorry, there was an error editing your post. Please try again." upload: "Sorry, there was an error uploading that file. Please try again." - file_too_large: "Sorry, that file is too big (maximum size is {{max_size_kb}}kb). Why not upload your large file to a cloud sharing service, then paste the link?" + file_too_large: "Sorry, that file is too big (maximum size is %{max_size_kb}kb). Why not upload your large file to a cloud sharing service, then paste the link?" too_many_uploads: "Sorry, you can only upload one file at a time." - too_many_dragged_and_dropped_files: "Sorry, you can only upload {{max}} files at a time." - upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: {{authorized_extensions}})." + too_many_dragged_and_dropped_files: "Sorry, you can only upload %{max} files at a time." + upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})." image_upload_not_allowed_for_new_user: "Sorry, new users can not upload images." attachment_upload_not_allowed_for_new_user: "Sorry, new users can not upload attachments." attachment_download_requires_login: "Sorry, you need to be logged in to download attachments." @@ -2632,10 +2632,10 @@ en: confirm: "Do you also want to delete the replies to this post?" direct_replies: one: "Yes, and %{count} direct reply" - other: "Yes, and {{count}} direct replies" + other: "Yes, and %{count} direct replies" all_replies: one: "Yes, and %{count} reply" - other: "Yes, and all {{count}} replies" + other: "Yes, and all %{count} replies" just_the_post: "No, just this post" admin: "post admin actions" wiki: "Make Wiki" @@ -2683,11 +2683,11 @@ en: one: "read this" other: "read this" like_capped: - one: "and {{count}} other liked this" - other: "and {{count}} others liked this" + one: "and %{count} other liked this" + other: "and %{count} others liked this" read_capped: - one: "and {{count}} other read this" - other: "and {{count}} others read this" + one: "and %{count} other read this" + other: "and %{count} others read this" by_you: off_topic: "You flagged this as off-topic" spam: "You flagged this as spam" @@ -2700,12 +2700,12 @@ en: delete: confirm: one: "Are you sure you want to delete that post?" - other: "Are you sure you want to delete those {{count}} posts?" + other: "Are you sure you want to delete those %{count} posts?" merge: confirm: one: "Are you sure you want to merge those posts?" - other: "Are you sure you want to merge those {{count}} posts?" + other: "Are you sure you want to merge those %{count} posts?" revisions: controls: @@ -2718,7 +2718,7 @@ en: revert: "Revert to this revision" edit_wiki: "Edit Wiki" edit_post: "Edit Post" - comparing_previous_to_current_out_of_total: "{{previous}} {{icon}} {{current}} / {{total}}" + comparing_previous_to_current_out_of_total: "%{previous} %{icon} %{current} / %{total}" displays: inline: title: "Show the rendered output with additions and removals inline" @@ -2915,13 +2915,13 @@ en: custom_message: at_least: one: "enter at least %{count} character" - other: "enter at least {{count}} characters" + other: "enter at least %{count} characters" more: one: "%{count} to go..." - other: "{{count}} to go..." + other: "%{count} to go..." left: one: "%{count} remaining" - other: "{{count}} remaining" + other: "%{count} remaining" flagging_topic: title: "Thanks for helping to keep our community civil!" @@ -2968,7 +2968,7 @@ en: title: "This topic is a personal message" help: "This topic is a personal message" posts: "Posts" - posts_long: "there are {{number}} posts in this topic" + posts_long: "there are %{number} posts in this topic" # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details posts_likes_MF: | @@ -2985,20 +2985,20 @@ en: replies: "Replies" views_long: one: "this topic has been viewed %{count} time" - other: "this topic has been viewed {{number}} times" + other: "this topic has been viewed %{number} times" activity: "Activity" likes: "Likes" likes_lowercase: one: "like" other: "likes" - likes_long: "there are {{number}} likes in this topic" + likes_long: "there are %{number} likes in this topic" users: "Users" users_lowercase: one: "user" other: "users" category_title: "Category" history: "History" - changed_by: "by {{author}}" + changed_by: "by %{author}" raw_email: title: "Incoming Email" @@ -3013,33 +3013,33 @@ en: title: "Latest" title_with_count: one: "Latest (%{count})" - other: "Latest ({{count}})" + other: "Latest (%{count})" help: "topics with recent posts" read: title: "Read" help: "topics you've read, in the order that you last read them" categories: title: "Categories" - title_in: "Category - {{categoryName}}" + title_in: "Category - %{categoryName}" help: "all topics grouped by category" unread: title: "Unread" title_with_count: one: "Unread (%{count})" - other: "Unread ({{count}})" + other: "Unread (%{count})" help: "topics you are currently watching or tracking with unread posts" lower_title_with_count: one: "%{count} unread" - other: "{{count}} unread" + other: "%{count} unread" new: lower_title_with_count: one: "%{count} new" - other: "{{count}} new" + other: "%{count} new" lower_title: "new" title: "New" title_with_count: one: "New (%{count})" - other: "New ({{count}})" + other: "New (%{count})" help: "topics created in the last few days" posted: title: "My Posts" @@ -3048,11 +3048,11 @@ en: title: "Bookmarks" help: "topics you have bookmarked" category: - title: "{{categoryName}}" + title: "%{categoryName}" title_with_count: - one: "{{categoryName}} (%{count})" - other: "{{categoryName}} ({{count}})" - help: "latest topics in the {{categoryName}} category" + one: "%{categoryName} (%{count})" + other: "%{categoryName} (%{count})" + help: "latest topics in the %{categoryName} category" top: title: "Top" help: "the most active topics in the last year, month, week or day" @@ -3222,8 +3222,8 @@ en: synonyms: "Synonyms" synonyms_description: "When the following tags are used, they will be replaced with %{base_tag_name}." tag_groups_info: - one: 'This tag belongs to the group "{{tag_groups}}".' - other: "This tag belongs to these groups: {{tag_groups}}." + one: 'This tag belongs to the group "%{tag_groups}".' + other: "This tag belongs to these groups: %{tag_groups}." category_restrictions: one: "It can only be used in this category:" other: "It can only be used in these categories:" @@ -3239,11 +3239,11 @@ en: delete_tag: "Delete Tag" delete_confirm: one: "Are you sure you want to delete this tag and remove it from %{count} topic it is assigned to?" - other: "Are you sure you want to delete this tag and remove it from {{count}} topics it is assigned to?" + other: "Are you sure you want to delete this tag and remove it from %{count} topics it is assigned to?" delete_confirm_no_topics: "Are you sure you want to delete this tag?" delete_confirm_synonyms: one: "Its synonym will also be deleted." - other: "Its {{count}} synonyms will also be deleted." + other: "Its %{count} synonyms will also be deleted." rename_tag: "Rename Tag" rename_instructions: "Choose a new name for the tag:" sort_by: "Sort by:" @@ -3620,10 +3620,10 @@ en: redeliver: "Redeliver" incoming: one: "There is a new event." - other: "There are {{count}} new events." + other: "There are %{count} new events." completed_in: one: "Completed in %{count} second." - other: "Completed in {{count}} seconds." + other: "Completed in %{count} seconds." request: "Request" response: "Response" redeliver_confirm: "Are you sure you want to redeliver the same payload?" @@ -3676,12 +3676,12 @@ en: label: "Upload" title: "Upload a backup to this instance" uploading: "Uploading..." - uploading_progress: "Uploading... {{progress}}%" - success: "'{{filename}}' has successfully been uploaded. The file is now being processed and will take up to a minute to show up in the list." - error: "There has been an error while uploading '{{filename}}': {{message}}" + uploading_progress: "Uploading... %{progress}%" + success: "'%{filename}' has successfully been uploaded. The file is now being processed and will take up to a minute to show up in the list." + error: "There has been an error while uploading '%{filename}': %{message}" operations: is_running: "An operation is currently running..." - failed: "The {{operation}} failed. Please check the logs." + failed: "The %{operation} failed. Please check the logs." cancel: label: "Cancel" title: "Cancel the current operation" @@ -3808,7 +3808,7 @@ en: disabled_component_tooltip: "This component has been disabled" default_theme_tooltip: "This theme is the site's default theme" updates_available_tooltip: "Updates are available for this theme" - and_x_more: "and {{count}} more." + and_x_more: "and %{count} more." collapse: Collapse uploads: "Uploads" no_uploads: "You can upload assets associated with your theme such as fonts and images" @@ -3857,8 +3857,8 @@ en: disabled_by: "This component has been disabled by" required_version: error: "This theme has been automatically disabled because it is not compatible with this version of Discourse." - minimum: "Requires Discourse version {{version}} or above." - maximum: "Requires Discourse version {{version}} or below." + minimum: "Requires Discourse version %{version} or above." + maximum: "Requires Discourse version %{version} or below." component_of: "Component of:" update_to_latest: "Update to Latest" check_for_updates: "Check for Updates" @@ -3871,7 +3871,7 @@ en: empty: "No items" commits_behind: one: "Theme is %{count} commit behind!" - other: "Theme is {{count}} commits behind!" + other: "Theme is %{count} commits behind!" compare_commits: "(See new commits)" repo_unreachable: "Couldn't contact the Git repository of this theme. Error message:" imported_from_archive: "This theme was imported from a .zip file" @@ -4283,8 +4283,8 @@ en: text: "Show" user: - suspend_failed: "Something went wrong suspending this user {{error}}" - unsuspend_failed: "Something went wrong unsuspending this user {{error}}" + suspend_failed: "Something went wrong suspending this user %{error}" + unsuspend_failed: "Something went wrong unsuspending this user %{error}" suspend_duration: "How long will the user be suspended for?" suspend_reason_label: "Why are you suspending? This text will be visible to everyone on this user's profile page, and will be shown to the user when they try to log in. Keep it short." suspend_reason_hidden_label: "Why are you suspending? This text will be shown to the user when they try to log in. Keep it short." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 7c043dc22b..7b564c402b 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -899,7 +899,7 @@ en: short_description: 'A violation of our community guidelines' long_form: "flagged this as inappropriate" notify_user: - title: "Send @{{username}} a message" + title: "Send @%{username} a message" description: "I want to talk to this person directly and personally about their post." short_description: "I want to talk to this person directly and personally about their post." long_form: "messaged user" @@ -4826,9 +4826,9 @@ en: title: "Reminder about old credentials" body: | Hello! This is a routine yearly security reminder from your Discourse instance. - + As a courtesy, we wanted to let you know that the following credentials used on your Discourse instance have not been updated in more than two years: - + %{keys} - + No action is required at this time, however, it is considered good security practice to cycle all your important credentials every few years. diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb index 41fbe2157f..7871a98729 100644 --- a/spec/integrity/i18n_spec.rb +++ b/spec/integrity/i18n_spec.rb @@ -141,13 +141,20 @@ describe "i18n integrity checks" do context "valid translations" do invalid_relative_links = {} invalid_relative_image_sources = {} + invalid_interpolation_key_format = {} each_translation(english_yaml) do |key, value| if value.match?(/href\s*=\s*["']\/[^\/]|\]\(\/[^\/]/i) invalid_relative_links[key] = value - elsif value.match?(/src\s*=\s*["']\/[^\/]/i) + end + + if value.match?(/src\s*=\s*["']\/[^\/]/i) invalid_relative_image_sources[key] = value end + + if value.match?(/\{\{.+?}}/) + invalid_interpolation_key_format[key] = value + end end it "uses %{base_url} or %{base_path} for relative links" do @@ -159,6 +166,11 @@ describe "i18n integrity checks" do keys = invalid_relative_image_sources.keys.join("\n") expect(invalid_relative_image_sources).to be_empty, "The following keys have relative image sources, but do not start with %{base_url} or %{base_path}:\n\n#{keys}" end + + it "uses the %{key} as interpolation key format" do + keys = invalid_interpolation_key_format.keys.join("\n") + expect(invalid_interpolation_key_format).to be_empty, "The following keys use {{key}} instead of %{key} for interpolation keys:\n\n#{keys}" + end end end diff --git a/test/javascripts/fixtures/site-fixtures.js b/test/javascripts/fixtures/site-fixtures.js index 875ef8f67e..644ab21900 100644 --- a/test/javascripts/fixtures/site-fixtures.js +++ b/test/javascripts/fixtures/site-fixtures.js @@ -490,7 +490,7 @@ export default { }, { name_key: "notify_user", - name: "Notify {{username}}", + name: "Notify %{username}", description: "This post contains something I want to talk to this person directly and privately about. Does not cast a flag.", short_description: diff --git a/test/javascripts/helpers/site.js b/test/javascripts/helpers/site.js index ce7ffc8825..a1432aac5e 100644 --- a/test/javascripts/helpers/site.js +++ b/test/javascripts/helpers/site.js @@ -320,7 +320,7 @@ PreloadStore.store("site", { }, { name_key: "notify_user", - name: "Notify {{username}}", + name: "Notify %{username}", description: "This post contains something I want to talk to this person directly and privately about.", long_form: "notified user",