diff --git a/android/build.gradle b/android/build.gradle index 7173a50bfe..c7ff24eda2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -158,8 +158,8 @@ android { targetSdkVersion propTargetSdkVersion.toInteger() applicationId project.ext.appId buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"' - buildConfigField 'String', 'REVIEW_URL', '"https://organicmaps.app/donate/"' - buildConfigField 'int', 'RATING_THRESHOLD', '5' + // Should be customized in flavors. + buildConfigField 'String', 'REVIEW_URL', '""' multiDexEnabled true multiDexKeepFile file('multidex-config.txt') diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml index 4e69c609be..59ba89091a 100644 --- a/android/res/values/donottranslate.xml +++ b/android/res/values/donottranslate.xml @@ -60,7 +60,4 @@ ALWAYS AUTO com.google.android.material.bottomsheet.BottomSheetBehavior - - https://organicmaps.app/privacy - https://organicmaps.app/terms diff --git a/android/src/app/organicmaps/help/HelpFragment.java b/android/src/app/organicmaps/help/HelpFragment.java index 8f9a2b9ce8..154820853f 100644 --- a/android/src/app/organicmaps/help/HelpFragment.java +++ b/android/src/app/organicmaps/help/HelpFragment.java @@ -88,7 +88,10 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene setupItem(R.id.donate, true, root); setupItem(R.id.support_us, true, root); } - setupItem(R.id.rate, true, root); + if (BuildConfig.REVIEW_URL.isEmpty()) + root.findViewById(R.id.rate).setVisibility(View.GONE); + else + setupItem(R.id.rate, true, root); setupItem(R.id.copyright, false, root); View termOfUseView = root.findViewById(R.id.term_of_use_link); View privacyPolicyView = root.findViewById(R.id.privacy_policy); @@ -105,12 +108,12 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene private void onPrivacyPolicyClick() { - openLink(getResources().getString(R.string.privacy_policy_url)); + openLink(getResources().getString(R.string.translated_om_site_url) + "policy/"); } private void onTermOfUseClick() { - openLink(getResources().getString(R.string.terms_of_use_url)); + openLink(getResources().getString(R.string.translated_om_site_url) + "terms/"); } @Override @@ -118,9 +121,9 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene { final int id = v.getId(); if (id == R.id.web) - openLink(Constants.Url.WEB_SITE); + openLink(getResources().getString(R.string.translated_om_site_url)); else if (id == R.id.news) - openLink(Constants.Url.NEWS); + openLink(getResources().getString(R.string.translated_om_site_url) + "news/"); else if (id == R.id.email) Utils.sendTo(requireContext(), BuildConfig.SUPPORT_MAIL, "Organic Maps"); else if (id == R.id.github) @@ -142,7 +145,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene else if (id == R.id.report) Utils.sendBugReport(requireActivity(), ""); else if (id == R.id.support_us) - openLink(Constants.Url.SUPPORT_US); + openLink(getResources().getString(R.string.translated_om_site_url) + "support-us/"); else if (id == R.id.donate) openLink(mDonateUrl); else if (id == R.id.rate) diff --git a/android/src/app/organicmaps/util/Constants.java b/android/src/app/organicmaps/util/Constants.java index e71a2ad36a..f646624483 100644 --- a/android/src/app/organicmaps/util/Constants.java +++ b/android/src/app/organicmaps/util/Constants.java @@ -25,10 +25,6 @@ public final class Constants public static final String TWITTER = "https://twitter.com/OrganicMapsApp"; public static final String MATRIX = "https://matrix.to/#/%23organicmaps:matrix.org"; - public static final String SUPPORT_US = "https://organicmaps.app/support-us"; - - public static final String NEWS = "https://organicmaps.app/news/"; - public static final String WEB_SITE = "https://organicmaps.app"; public static final String GITHUB = "https://github.com/organicmaps/organicmaps"; public static final String COPYRIGHT = "file:///android_asset/copyright.html"; @@ -45,7 +41,6 @@ public final class Constants public static class Email { public static final String SUPPORT = BuildConfig.SUPPORT_MAIL; - public static final String RATING = "rating@organicmaps.app"; private Email() {} } diff --git a/data/faq.html b/data/faq.html index 643131ae02..5ba8ea747b 100644 --- a/data/faq.html +++ b/data/faq.html @@ -338,7 +338,7 @@

Больше информации на нашем сайте - organicmaps.app + organicmaps.app

Für weitere Informationen besuchen Sie bitte unsere Website diff --git a/data/strings/strings.txt b/data/strings/strings.txt index e591e6f508..cb2510a906 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -25051,7 +25051,7 @@ zh-Hant = 來自 OpenStreetMap 的地圖數據 [telegram_url] - comment = Telegram group url for the help page + comment = Telegram group url for the "?" About page tags = android,ios en = https://t.me/OrganicMapsApp be = https://t.me/OrganicMapsRu @@ -25060,7 +25060,16 @@ tr = https://t.me/OrganicMapsTR [instagram_url] - comment = Instagram account url for the help page + comment = Instagram account url for the "?" About page tags = android,ios en = https://www.instagram.com/organicmaps.app tr = https://www.instagram.com/organicmapstr + + [translated_om_site_url] + comment = Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content + tags = android,ios + en = https://organicmaps.app/ + be = https://organicmaps.app/ru/ + it = https://organicmaps.app/it/ + ru = https://organicmaps.app/ru/ + tr = https://organicmaps.app/tr/ diff --git a/iphone/Maps/UI/Help/AboutController.swift b/iphone/Maps/UI/Help/AboutController.swift index f0e8f01c60..fd20eff484 100644 --- a/iphone/Maps/UI/Help/AboutController.swift +++ b/iphone/Maps/UI/Help/AboutController.swift @@ -165,13 +165,13 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi // See labels array above. switch indexPath[0] { // Header section click. - case 0: self.openUrl("https://organicmaps.app/donate/") + case 0: self.openUrl(L("translated_om_site_url") + "donate/") // First buttons section. case 1: switch indexPath[1] { - case 0: self.openUrl("https://organicmaps.app/news/") + case 0: self.openUrl(L("translated_om_site_url") + "news/") case 1: self.navigationController?.pushViewController(FaqController(), animated: true) case 2: sendEmailWith(header: "Organic Maps Bugreport", toRecipients: [kiOSEmail]) - case 3: self.openUrl("https://organicmaps.app/support-us/") + case 3: self.openUrl(L("translated_om_site_url") + "support-us/") case 4: UIApplication.shared.rateApp() default: fatalError("Invalid cell0 \(indexPath)") } @@ -179,7 +179,7 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi case 2: switch indexPath[1] { case 0: self.openUrl(L("telegram_url"), inSafari: true) case 1: self.openUrl("https://github.com/organicmaps/organicmaps/", inSafari: true) - case 2: self.openUrl("https://organicmaps.app/") + case 2: self.openUrl(L("translated_om_site_url")) case 3: sendEmailWith(header: "Organic Maps", toRecipients: [kiOSEmail]) case 4: self.openUrl("https://facebook.com/OrganicMaps", inSafari: true) case 5: self.openUrl("https://twitter.com/OrganicMapsApp", inSafari: true) @@ -190,8 +190,8 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi } // Third section. case 3: switch indexPath[1] { - case 0: self.openUrl("https://organicmaps.app/privacy") - case 1: self.openUrl("https://organicmaps.app/terms") + case 0: self.openUrl(L("translated_om_site_url") + "privacy/") + case 1: self.openUrl(L("translated_om_site_url") + "terms/") case 2: showCopyright() default: fatalError("Invalid cell2 \(indexPath)") }