Merge pull request #1040 from tchapgouv/1039-changer-le-copyright-de-…

…fournisseur-de-fond-de-carte Changement du copyright de fournisseur de fond de carte de géolocalis…
tchapgouv · May 16, 2024 · 420d8b4 · 420d8b4
2 parents a42a720 + 4f80e8d
commit 420d8b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+Changement du copyright de fournisseur de fond de carte de géolocalisation
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Changement du copyright de fournisseur de fond de carte de géolocalisation