From 3184bec5ae1134736f1ac683719c2a02958dd524 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 20 Mar 2020 17:22:23 +0000
Subject: [PATCH] Fix some untranslateable strings

Fixes #2565
---
 app/assets/javascripts/leaflet.map.js |  8 +++++---
 config/locales/en.yml                 | 13 +++++++++++++
 lib/auth.rb                           | 15 +++++++++------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 797a57e20..a139b6dcd 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -18,6 +18,8 @@ L.OSM.Map = L.Map.extend({
     var copyright = I18n.t("javascripts.map.copyright", { copyright_url: "/copyright" });
     var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" });
     var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" });
+    var thunderforest = I18n.t("javascripts.map.thunderforest", { thunderforest_url: "https://www.thunderforest.com/" });
+    var hotosm = I18n.t("javascripts.map.hotosm", { hotosm_url: "https://www.hotosm.org/", osmfrance_url: "https://openstreetmap.fr/" });
 
     this.baseLayers = [];
 
@@ -30,7 +32,7 @@ L.OSM.Map = L.Map.extend({
 
     if (OSM.THUNDERFOREST_KEY) {
       this.baseLayers.push(new L.OSM.CycleMap({
-        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>. " + terms,
+        attribution: copyright + ". " + thunderforest + ". " + terms,
         apikey: OSM.THUNDERFOREST_KEY,
         code: "C",
         keyid: "cyclemap",
@@ -38,7 +40,7 @@ L.OSM.Map = L.Map.extend({
       }));
 
       this.baseLayers.push(new L.OSM.TransportMap({
-        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>. " + terms,
+        attribution: copyright + ". " + thunderforest + ". " + terms,
         apikey: OSM.THUNDERFOREST_KEY,
         code: "T",
         keyid: "transportmap",
@@ -47,7 +49,7 @@ L.OSM.Map = L.Map.extend({
     }
 
     this.baseLayers.push(new L.OSM.HOT({
-      attribution: copyright + ". Tiles style by <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='https://openstreetmap.fr/' target='_blank'>OpenStreetMap France</a>. " + terms,
+      attribution: copyright + ". " + hotosm + ". " + terms,
       code: "H",
       keyid: "hot",
       name: I18n.t("javascripts.map.base.hot")
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2c31ba2d9..089c31a44 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -42,6 +42,7 @@ en:
       diary_comment: "Diary Comment"
       diary_entry: "Diary Entry"
       friend: "Friend"
+      issue: "Issue"
       language: "Language"
       message: "Message"
       node: "Node"
@@ -58,6 +59,7 @@ en:
       relation: "Relation"
       relation_member: "Relation Member"
       relation_tag: "Relation Tag"
+      report: "Report"
       session: "Session"
       trace: "Trace"
       tracepoint: "Trace Point"
@@ -160,6 +162,15 @@ en:
     remote:
       name: "Remote Control"
       description: "Remote Control (JOSM or Merkaartor)"
+  auth:
+    providers:
+      none: None
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -2493,6 +2504,8 @@ en:
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+      thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+      hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
diff --git a/lib/auth.rb b/lib/auth.rb
index 6190831f7..ff9a22663 100644
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,9 +1,12 @@
 module Auth
-  PROVIDERS = { "None" => "", "OpenID" => "openid" }.tap do |providers|
-    providers["Google"] = "google" if Settings.key?(:google_auth_id)
-    providers["Facebook"] = "facebook" if Settings.key?(:facebook_auth_id)
-    providers["Windows Live"] = "windowslive" if Settings.key?(:windowslive_auth_id)
-    providers["GitHub"] = "github" if Settings.key?(:github_auth_id)
-    providers["Wikipedia"] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
+  PROVIDERS = {
+    I18n.t("auth.providers.none") => "",
+    I18n.t("auth.providers.openid") => "openid"
+  }.tap do |providers|
+    providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id)
+    providers[I18n.t("auth.providers.facebook")] = "facebook" if Settings.key?(:facebook_auth_id)
+    providers[I18n.t("auth.providers.windowslive")] = "windowslive" if Settings.key?(:windowslive_auth_id)
+    providers[I18n.t("auth.providers.github")] = "github" if Settings.key?(:github_auth_id)
+    providers[I18n.t("auth.providers.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
   end.freeze
 end
-- 
2.39.5