From 85264805132ce58a3e900b26688b1dc7399a4b82 Mon Sep 17 00:00:00 2001 From: cyber-toad Date: Sun, 26 Mar 2023 21:45:17 +0200 Subject: [PATCH] [strings] Add localized links for osm wiki page Signed-off-by: cyber-toad --- .../organicmaps/editor/EditorFragment.java | 2 +- .../organicmaps/editor/ProfileFragment.java | 2 +- .../app/organicmaps/help/HelpFragment.java | 2 +- .../src/app/organicmaps/util/Constants.java | 1 - data/strings/strings.txt | 23 +++++++++++++++++++ .../MWMAuthorizationLoginViewController.mm | 2 +- iphone/Maps/UI/Editor/MWMEditorNotesFooter.m | 2 +- iphone/Maps/UI/Help/AboutController.swift | 2 +- 8 files changed, 29 insertions(+), 7 deletions(-) diff --git a/android/src/app/organicmaps/editor/EditorFragment.java b/android/src/app/organicmaps/editor/EditorFragment.java index f1c98dabea..3533049e78 100644 --- a/android/src/app/organicmaps/editor/EditorFragment.java +++ b/android/src/app/organicmaps/editor/EditorFragment.java @@ -521,7 +521,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe else if (id == R.id.add_langs) mParent.addLanguage(); else if (id == R.id.about_osm) - startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(Constants.Url.OSM_ABOUT))); + startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(getString(R.string.osm_wiki_about_url)))); else if (id == R.id.reset) reset(); } diff --git a/android/src/app/organicmaps/editor/ProfileFragment.java b/android/src/app/organicmaps/editor/ProfileFragment.java index 483f216d49..89a6b0b652 100644 --- a/android/src/app/organicmaps/editor/ProfileFragment.java +++ b/android/src/app/organicmaps/editor/ProfileFragment.java @@ -97,7 +97,7 @@ public class ProfileFragment extends BaseMwmToolbarFragment private void openOsmAboutUrl() { - startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(Constants.Url.OSM_ABOUT))); + startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(getString(R.string.osm_wiki_about_url)))); } private void openOsmHistoryUrl() diff --git a/android/src/app/organicmaps/help/HelpFragment.java b/android/src/app/organicmaps/help/HelpFragment.java index 5d2d4c54c9..37edcc87bd 100644 --- a/android/src/app/organicmaps/help/HelpFragment.java +++ b/android/src/app/organicmaps/help/HelpFragment.java @@ -137,7 +137,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene else if (id == R.id.mastodon) openLink(Constants.Url.MASTODON); else if (id == R.id.openstreetmap) - openLink(Constants.Url.OSM_ABOUT); + openLink(getString(R.string.osm_wiki_about_url)); else if (id == R.id.faq) ((HelpActivity) requireActivity()).stackFragment(FaqFragment.class, getString(R.string.faq), null); else if (id == R.id.report) diff --git a/android/src/app/organicmaps/util/Constants.java b/android/src/app/organicmaps/util/Constants.java index 4e1acc9567..3bf2f188e9 100644 --- a/android/src/app/organicmaps/util/Constants.java +++ b/android/src/app/organicmaps/util/Constants.java @@ -34,7 +34,6 @@ public final class Constants public static final String OSM_REGISTER = "https://www.openstreetmap.org/user/new"; public static final String OSM_RECOVER_PASSWORD = "https://www.openstreetmap.org/user/forgot-password"; - public static final String OSM_ABOUT = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; private Url() {} } diff --git a/data/strings/strings.txt b/data/strings/strings.txt index e9475072d0..d6f1627ff2 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -25383,3 +25383,26 @@ it = https://organicmaps.app/it/ ru = https://organicmaps.app/ru/ tr = https://organicmaps.app/tr/ + + [osm_wiki_about_url] + comment = Link to OSM wiki for Editor, Profile and About pages + tags = android,ios + en = https://wiki.openstreetmap.org/wiki/About_OpenStreetMap + ar = https://wiki.openstreetmap.org/wiki/Ar:About_OpenStreetMap + ca = https://wiki.openstreetmap.org/wiki/Ca:About + da = https://wiki.openstreetmap.org/wiki/Da:Om_OpenStreetMap + de = https://wiki.openstreetmap.org/wiki/DE:Über_OSM + el = https://wiki.openstreetmap.org/wiki/El:About_OpenStreetMap + es = https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap + fa = https://wiki.openstreetmap.org/wiki/Fa:About_OpenStreetMap + fr = https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap + hu = https://wiki.openstreetmap.org/wiki/Hu:Névjegy + it = https://wiki.openstreetmap.org/wiki/IT:About + ja = https://wiki.openstreetmap.org/wiki/JA:参加する + ko = https://wiki.openstreetmap.org/wiki/Ko:OpenStreetMap_소개 + nl = https://wiki.openstreetmap.org/wiki/NL:Wat_is_OpenStreetMap%3F + pl = https://wiki.openstreetmap.org/wiki/Pl:Wstęp + pt = https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap + ru = https://wiki.openstreetmap.org/wiki/RU:О_проекте + tr = https://wiki.openstreetmap.org/wiki/Tr:About + uk = https://wiki.openstreetmap.org/wiki/Uk:Про_проект \ No newline at end of file diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index e6038d25f9..be7f2b90c7 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -101,7 +101,7 @@ using namespace osm_auth_ios; - (IBAction)osmTap { - [self openUrl:@"https://wiki.openstreetmap.org/wiki/Main_Page"]; + [self openUrl:L(@"osm_wiki_about_url")]; } - (IBAction)historyTap diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m index 8b525436f0..3bce0d23d4 100644 --- a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m +++ b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m @@ -22,7 +22,7 @@ - (IBAction)osmTap { - [self.controller openUrl:@"https://wiki.openstreetmap.org/wiki/Main_Page"]; + [self.controller openUrl:L(@"osm_wiki_about_url")]; } @end diff --git a/iphone/Maps/UI/Help/AboutController.swift b/iphone/Maps/UI/Help/AboutController.swift index 22a37bac26..114586bf63 100644 --- a/iphone/Maps/UI/Help/AboutController.swift +++ b/iphone/Maps/UI/Help/AboutController.swift @@ -201,7 +201,7 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi case 6: self.openUrl("https://facebook.com/OrganicMaps", inSafari: true) case 7: self.openUrl("https://twitter.com/OrganicMapsApp", inSafari: true) case 8: self.openUrl(L("instagram_url"), inSafari: true) - case 9: self.openUrl("https://wiki.openstreetmap.org/wiki/About_OpenStreetMap", inSafari: true) + case 9: self.openUrl(L("osm_wiki_about_url"), inSafari: true) default: fatalError("Invalid cell1 \(indexPath)") } // Third section.