From 4f80e8dada7a3275e8fb378d8205951780b561b8 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet <nbuquet@buquet-net.com> Date: Thu, 16 May 2024 14:22:29 +0200 Subject: [PATCH] =?UTF-8?q?Changement=20du=20copyright=20de=20fournisseur?= =?UTF-8?q?=20de=20fond=20de=20carte=20de=20g=C3=A9olocalisation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LocationView/RoomTimelineLocationView.xib | 2 +- .../MapCredits/MapCreditsActionSheet.swift | 9 ++++++--- changelog.d/1039.change | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 changelog.d/1039.change diff --git a/Riot/Modules/Room/TimelineCells/LocationView/RoomTimelineLocationView.xib b/Riot/Modules/Room/TimelineCells/LocationView/RoomTimelineLocationView.xib index eef892393..0a7ac3675 100644 --- a/Riot/Modules/Room/TimelineCells/LocationView/RoomTimelineLocationView.xib +++ b/Riot/Modules/Room/TimelineCells/LocationView/RoomTimelineLocationView.xib @@ -86,7 +86,7 @@ This homeserver is not configured to display maps</string> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HzR-Av-TiG"> <rect key="frame" x="0.0" y="0.0" width="395" height="20"/> <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text="©MapTiler ©OpenStreetMap contributors" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jWW-0w-1YM"> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text="© Etalab © OpenMapTiles © Contributeurs OpenStreetMap" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jWW-0w-1YM"> <rect key="frame" x="8" y="0.0" width="379" height="20"/> <edgeInsets key="layoutMargins" top="0.0" left="0.0" bottom="0.0" right="0.0"/> <fontDescription key="fontDescription" type="system" pointSize="10"/> diff --git a/RiotSwiftUI/Modules/LocationSharing/MapCredits/MapCreditsActionSheet.swift b/RiotSwiftUI/Modules/LocationSharing/MapCredits/MapCreditsActionSheet.swift index 927aceef0..110863017 100644 --- a/RiotSwiftUI/Modules/LocationSharing/MapCredits/MapCreditsActionSheet.swift +++ b/RiotSwiftUI/Modules/LocationSharing/MapCredits/MapCreditsActionSheet.swift @@ -24,11 +24,14 @@ struct MapCreditsActionSheet { var sheet: ActionSheet { ActionSheet(title: Text(VectorL10n.locationSharingMapCreditsTitle), buttons: [ - .default(Text("© MapTiler")) { - openURL(URL(string: "https://www.maptiler.com/copyright/")!) + .default(Text("© Etalab")) { + openURL(URL(string: "https://www.etalab.gouv.fr/")!) + }, + .default(Text("© OpenMapTiles")) { + openURL(URL(string: "https://www.openmaptiles.org/")!) }, .default(Text("© OpenStreetMap")) { - openURL(URL(string: "https://www.openstreetmap.org/copyright")!) + openURL(URL(string: "https://www.openstreetmap.org/copyright/")!) }, .cancel() ]) diff --git a/changelog.d/1039.change b/changelog.d/1039.change new file mode 100644 index 000000000..8bf27f088 --- /dev/null +++ b/changelog.d/1039.change @@ -0,0 +1 @@ +Changement du copyright de fournisseur de fond de carte de géolocalisation \ No newline at end of file