Merge pull request #1102 from tchapgouv/1091-ajouter-une-description-…

…sous-les-notifications-de-compte Update label under notifications toggle in Settings.
tchapgouv · Nov 4, 2024 · 115bec4 · 115bec4
2 parents 6bf3e98 + 685b5b8
commit 115bec4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 36 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -20,12 +20,12 @@ PODS:
   - Down (0.11.0)
   - DSBottomSheet (0.3.0)
   - DSWaveformImage (6.1.1)
-  - FLEX (5.22.10)
+  - FLEX (4.5.0)
   - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (7.1.0):
     - GBDeviceInfo/Core (= 7.1.0)
   - GBDeviceInfo/Core (7.1.0)
-  - GZIP (1.3.2)
+  - GZIP (1.3.0)
   - Introspect (0.12.0)
   - JitsiMeetSDKLite (8.1.2-lite):
     - JitsiWebRTC (~> 111.0)
@@ -39,26 +39,26 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.13):
-    - MatrixSDK/Core (= 0.27.13)
-  - MatrixSDK/Core (0.27.13):
+  - MatrixSDK (0.27.2):
+    - MatrixSDK/Core (= 0.27.2)
+  - MatrixSDK/Core (0.27.2):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - MatrixSDKCrypto (= 0.4.3)
+    - MatrixSDKCrypto (= 0.3.12)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.13):
+  - MatrixSDK/JingleCallStack (0.27.2):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
-  - MatrixSDKCrypto (0.4.3)
+  - MatrixSDKCrypto (0.3.12)
   - OLMKit (3.2.12):
     - OLMKit/olmc (= 3.2.12)
     - OLMKit/olmcpp (= 3.2.12)
   - OLMKit/olmc (3.2.12)
   - OLMKit/olmcpp (3.2.12)
-  - PostHog (2.0.0)
+  - PostHog (2.0.2)
   - ReadMoreTextView (3.0.1)
   - Realm (10.27.0):
     - Realm/Headers (= 10.27.0)
@@ -74,37 +74,36 @@ PODS:
   - Sentry/Core (7.15.0)
   - SideMenu (6.5.0)
   - SwiftBase32 (0.9.0)
-  - SwiftFormat/CLI (0.54.5)
-  - SwiftGen (6.6.3)
+  - SwiftGen (6.6.2)
   - SwiftJWT (3.6.200):
     - BlueCryptor (~> 1.0)
     - BlueECC (~> 1.1)
     - BlueRSA (~> 1.0)
     - KituraContracts (~> 1.2)
     - LoggerAPI (~> 1.7)
-  - SwiftLint (0.57.0)
+  - SwiftLint (0.49.1)
   - SwiftyBeaver (1.9.5)
   - UICollectionViewLeftAlignedLayout (1.0.2)
   - UICollectionViewRightAlignedLayout (0.0.3)
   - WeakDictionary (2.0.2)
   - zxcvbn-ios (1.0.4)
-  - ZXingObjC (3.6.9):
-    - ZXingObjC/All (= 3.6.9)
-  - ZXingObjC/All (3.6.9)
+  - ZXingObjC (3.6.5):
+    - ZXingObjC/All (= 3.6.5)
+  - ZXingObjC/All (3.6.5)
 
 DEPENDENCIES:
   - Down (~> 0.11.0)
   - DSBottomSheet (~> 0.3)
   - DSWaveformImage (~> 6.1.1)
-  - FLEX (~> 5.22.10)
+  - FLEX (~> 4.5.0)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 7.1.0)
   - Introspect (~> 0.1)
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (from `matrix-ios-sdk/MatrixSDK.podspec`)
-  - MatrixSDK/JingleCallStack (from `matrix-ios-sdk/MatrixSDK.podspec`)
+  - MatrixSDK (= 0.27.2)
+  - MatrixSDK/JingleCallStack (= 0.27.2)
   - OLMKit
   - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
@@ -113,15 +112,14 @@ DEPENDENCIES:
   - Sentry (~> 7.15.0)
   - SideMenu (~> 6.5)
   - SwiftBase32 (~> 0.9.0)
-  - SwiftFormat/CLI
   - SwiftGen (~> 6.3)
   - SwiftJWT (~> 3.6.200)
   - SwiftLint (~> 0.49.1)
   - UICollectionViewLeftAlignedLayout (~> 1.0.2)
   - UICollectionViewRightAlignedLayout (~> 0.0.3)
   - WeakDictionary (~> 2.0)
   - zxcvbn-ios
-  - ZXingObjC (~> 3.6.9)
+  - ZXingObjC (~> 3.6.5)
 
 SPEC REPOS:
   trunk:
@@ -146,6 +144,7 @@ SPEC REPOS:
     - libPhoneNumber-iOS
     - LoggerAPI
     - Logging
+    - MatrixSDK
     - MatrixSDKCrypto
     - OLMKit
     - PostHog
@@ -156,7 +155,6 @@ SPEC REPOS:
     - Sentry
     - SideMenu
     - SwiftBase32
-    - SwiftFormat
     - SwiftGen
     - SwiftJWT
     - SwiftLint
@@ -167,10 +165,6 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
-EXTERNAL SOURCES:
-  MatrixSDK:
-    :path: matrix-ios-sdk/MatrixSDK.podspec
-
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
@@ -179,10 +173,10 @@ SPEC CHECKSUMS:
   Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
   DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
-  FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce
+  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
   FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: 5d62fa85bdcce3ed288d83c28789adf1173e4376
-  GZIP: 3c0abf794bfce8c7cb34ea05a1837752416c8868
+  GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   Introspect: b66b675de8a85d9ef832f3a710d8e3c7db186884
   JitsiMeetSDKLite: 895213158cf62342069a10634a41d2f1c00057f7
   JitsiWebRTC: 80f62908fcf2a1160e0d14b584323fb6e6be630b
@@ -193,28 +187,27 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 1dae186c839eb145974fc1fc127ec903de60a297
-  MatrixSDKCrypto: 27bee960e0e8b3a3039f3f3e93dd2ec88299c77e
+  MatrixSDK: c1e61a8ee3e5ccb8a18070b7dde088dee6e59f19
+  MatrixSDKCrypto: 25929a40733b4ab54f659aaf6a730552a0a06504
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
-  PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
+  PostHog: f9e5c13ceea86bb5314218c85d16125b797eb332
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 9ca328bd7e700cc19703799785e37f77d1a130f2
   Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
   RxSwift: 915abbdfb62214aa89ccd0b194d44fb478019b27
   Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7
   SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
   SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
-  SwiftFormat: 543a7b1ab4a6ce2d88bd5616a17903446ca3dc5c
-  SwiftGen: 4993cbf71cbc4886f775e26f8d5c3a1188ec9f99
+  SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c
   SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
-  SwiftLint: eb47480d47c982481592c195c221d11013a679cc
+  SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
   UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6
   UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d
   WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
-  ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
+  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: fb3e1c62f9e35a9bdbafce743664bf4f620af028
+PODFILE CHECKSUM: bdd98ddb1a6b2f5d45b1fc00ccfbf2dbaeeb0ff0
 
 COCOAPODS: 1.15.2
diff --git a/Tchap/Assets/Localizations/fr.lproj/Tchap.strings b/Tchap/Assets/Localizations/fr.lproj/Tchap.strings
@@ -352,7 +352,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MARK: Settings
-"settings_enable_push_notif_text" = "Sans cette autorisation, les appels entrants ne seront pas notifiés.";
+"settings_enable_push_notif_text" = "Sans cette autorisation, les messages et appels entrants ne seront pas notifiés.";
 "settings_enable_email_notif_text" = "Recevez un e-mail si au moins un message récent non lu pendant 72h.";
 "settings_enable_email_notif_link" = "En savoir plus.";
 "settings_enable_inapp_notifications_description" = "Le compte correspond à tous vos appareils connectés à Tchap.";
diff --git a/changelog.d/1091.change b/changelog.d/1091.change
@@ -0,0 +1 @@
+Changement de l'explication sous le bouton d'activation des notifications pour mentionner les messages et les appels entrants.