From 4a38b3eea4bc36dcbcf625e46689688f3b5b12e2 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sat, 25 Feb 2023 18:36:42 +0100 Subject: [PATCH 01/13] Remove translations no longer used on the login page This page was refactored in 2a3bc0a38789b29b8798eafd80fc4fb77c5c7957 --- config/locales/en.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index fc01c22ae..7082a5fb9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1779,13 +1779,8 @@ en: lost password link: "Lost your password?" login_button: "Login" register now: Register now - with username: "Already have an OpenStreetMap account? Please login with your username and password:" with external: "Alternatively, use a third party to login:" - new to osm: New to OpenStreetMap? - to make changes: To make changes to the OpenStreetMap data, you must have an account. - create account minute: Create an account. It only takes a minute. no account: Don't have an account? - account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email." auth failure: "Sorry, could not log in with those details." openid_logo_alt: "Log in with an OpenID" auth_providers: From 7e68566c46dd62ae102592c6015f764da5205d3a Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sun, 26 Feb 2023 11:12:41 +0100 Subject: [PATCH 02/13] Remove unused metro extract translations Refs 9340c461732ef7387dd453ea3fcf5e64ea782ab4 --- config/locales/en.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 7082a5fb9..9632c7e09 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2068,9 +2068,6 @@ en: geofabrik: title: "Geofabrik Downloads" description: "Regularly-updated extracts of continents, countries, and selected cities" - metro: - title: "Metro Extracts" - description: "Extracts for major world cities and their surrounding areas" other: title: "Other Sources" description: "Additional sources listed on the OpenStreetMap Wiki" From b4774d71951f93b38f2bca35c8b6579249d55ca3 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sun, 26 Feb 2023 11:22:32 +0100 Subject: [PATCH 03/13] Remove unused tooltip translations These were removed in 2d9a083b365e5cfa527c40add35464630c1a9b00 --- config/locales/en.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9632c7e09..df346808d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1485,10 +1485,8 @@ en: home: Go to Home Location logout: Log Out log_in: Log In - log_in_tooltip: Log in with an existing account sign_up: Sign Up start_mapping: Start Mapping - sign_up_tooltip: Create an account for editing edit: Edit history: History export: Export From bc578c01166aa28ac0bdf977e295a2a058432188 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sun, 26 Feb 2023 14:49:40 +0100 Subject: [PATCH 04/13] Remove unused translations These were removed in 6adcce4e5d75fa21dea85742fa3 --- config/locales/en.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index df346808d..8ce6f6078 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1518,8 +1518,6 @@ en: community: Community community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" - foundation: Foundation - foundation_title: The OpenStreetMap Foundation make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation From 468f67fe4d378026dcb0eccf42f6a1ad42e72267 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sun, 26 Feb 2023 15:23:07 +0100 Subject: [PATCH 05/13] Remove used translations for new messages We use the activerecord attribute hierarchy for this --- config/locales/en.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 8ce6f6078..a41486480 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1670,8 +1670,6 @@ en: new: title: "Send message" send_message_to_html: "Send a new message to %{name}" - subject: "Subject" - body: "Body" back_to_inbox: "Back to inbox" create: message_sent: "Message sent" From c2c667267e2cf4f7c93db28f3fbf0ca85d7e29b3 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sun, 26 Feb 2023 15:27:05 +0100 Subject: [PATCH 06/13] Remove translations that are no longer used when showing messages --- config/locales/en.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index a41486480..d36084022 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1694,14 +1694,10 @@ en: wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply." show: title: "Read message" - from: "From" - subject: "Subject" - date: "Date" reply_button: "Reply" unread_button: "Mark as unread" destroy_button: "Delete" back: "Back" - to: "To" wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it." sent_message_summary: destroy_button: "Delete" From a0eb071b800afc182b48f757f32d44cd33a6251c Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Tue, 28 Feb 2023 11:04:12 +0000 Subject: [PATCH 07/13] Remove old model name I doubt this was ever used, but anyway it was made redundant in 4395b79bf72f85543bce8ff3627eb7a0583b5ccc when the class was renamed. --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index d36084022..0a1b1cdea 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -52,7 +52,6 @@ en: message: "Message" node: "Node" node_tag: "Node Tag" - notifier: "Notifier" old_node: "Old Node" old_node_tag: "Old Node Tag" old_relation: "Old Relation" From e42e95c3decfea7770c8d5b2df2fbd5bb3de17ef Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Tue, 28 Feb 2023 11:05:46 +0000 Subject: [PATCH 08/13] Remove duplicate translation key It's already defined three lines above. --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 0a1b1cdea..9535207d5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2673,7 +2673,6 @@ en: support: support automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity. contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this. - support: support auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials From 86e51d7b678b7ad17c3c3ac0175a3233853ede5d Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 8 Mar 2023 14:46:12 +0000 Subject: [PATCH 09/13] Remove several unused translations from the user#show page --- config/locales/en.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9535207d5..526234a2d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2598,7 +2598,6 @@ en: deleted: "deleted" show: my diary: My Diary - new diary entry: new diary entry my edits: My Edits my traces: My Traces my notes: My Notes @@ -2627,8 +2626,6 @@ en: created from: "Created from:" status: "Status:" spam score: "Spam Score:" - description: Description - user location: User location role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2643,7 +2640,6 @@ en: comments: "Comments" create_block: "Block this User" activate_user: "Activate this User" - deactivate_user: "Deactivate this User" confirm_user: "Confirm this User" unconfirm_user: "Unconfirm this User" unsuspend_user: "Unsuspend this User" From f26ad95ade169f019d31412d02df2768a06d19f8 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 8 Mar 2023 14:51:13 +0000 Subject: [PATCH 10/13] Remove set_home translation The corresponding method was removed in 2010 with fbe529d87e61ab63bcf749067422ab2cbbb655d0 --- config/locales/en.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 526234a2d..4781ebf71 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2648,8 +2648,6 @@ en: delete_user: "Delete this User" confirm: "Confirm" report: Report this User - set_home: - flash success: "Home location saved successfully" go_public: flash success: "All your edits are now public, and you are now allowed to edit." index: From 35b278d2da50161ee7b0922435d425d3f5915ae2 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 8 Mar 2023 14:53:34 +0000 Subject: [PATCH 11/13] Remove used translations on the registration page We use activerecord attributes for this instead --- config/locales/en.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 4781ebf71..aa84d94e0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2556,9 +2556,6 @@ en: header: Free and editable paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use. paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account. - email address: "Email Address:" - confirm email address: "Confirm Email Address:" - display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." external auth: "Third Party Authentication:" use external auth: "Alternatively, use a third party to login" From 53ce4161bf1a0796d33f06c136afb7b2d1a160ec Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 8 Mar 2023 15:03:57 +0000 Subject: [PATCH 12/13] Remove used issues#update translations These are covered by reports#create, and there is no issues#update controller method or view. --- config/locales/en.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index aa84d94e0..c1f55bb44 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1398,10 +1398,6 @@ en: ignored: Ignored open: Open resolved: Resolved - update: - new_report: Your report has been registered successfully - successful_update: Your report has been updated successfully - provide_details: Please provide the required details show: title: "%{status} Issue #%{issue_id}" reports: From 4bf81418db30e7b0a7e9a0d184cea9343ff800e5 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 8 Mar 2023 15:10:19 +0000 Subject: [PATCH 13/13] Remove unused user_blocks translations These checkboxes were removed in 95c3d640a44857b0b92ec3be6dad606e40057c5c --- config/locales/en.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index c1f55bb44..3f803c6a3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2705,8 +2705,6 @@ en: title: "Creating block on %{name}" heading_html: "Creating block on %{name}" period: "How long, starting now, the user will be blocked from the API for." - tried_contacting: "I have contacted the user and asked them to stop." - tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications." back: "View all blocks" edit: title: "Editing block on %{name}" @@ -2718,8 +2716,6 @@ en: block_expired: "The block has already expired and cannot be edited." block_period: "The blocking period must be one of the values selectable in the drop-down list." create: - try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond." - try_waiting: "Please try giving the user a reasonable time to respond before blocking them." flash: "Created a block on user %{name}." update: only_creator_can_edit: "Only the moderator who created this block can edit it."