Merge branch 'release/tchap_v2.3.1'

tchapgouv · May 25, 2022 · bee4dc7 · bee4dc7
2 parents 69ba584 + 263ddae
commit bee4dc7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,15 @@
+Changes in Tchap 2.3.1 (2022-05-25)
+===================================
+
+Bugfixes 🐛
+----------
+ - Remove "answer in a thread" from the message's quick actions ([#599](https://github.com/tchapgouv/tchap-android-v2/issues/599))
+
+Other changes
+-------------
+ - Rename home tab titles ([#601](https://github.com/tchapgouv/tchap-android-v2/issues/601))
+
+
 Changes in Tchap 2.3.0 (2022-05-23)
 ===================================
 
@@ -16,6 +28,10 @@ Bugfixes 🐛
  - Fix Crash: Exception: kotlin.UninitializedPropertyAccessException: lateinit property login has not been initialized ([#557](https://github.com/tchapgouv/tchap-android-v2/issues/557))
  - Replace the "app_name" wording in the rageshake dialog ([#579](https://github.com/tchapgouv/tchap-android-v2/issues/579))
 
+Other changes
+-------------
+- Rebase against Element-Android v1.4.11 ([#541](https://github.com/tchapgouv/tchap-android/issues/541))
+
 
 Changes in Tchap 2.2.1 (2022-04-19)
 ===================================
@@ -39,7 +55,7 @@ Bugfixes 🐛
 
 Other changes
 -------------
- - Rebase against version v1.4.8 ([#497](https://github.com/tchapgouv/tchap-android/issues/497))
+ - Rebase against Element-Android v1.4.8 ([#497](https://github.com/tchapgouv/tchap-android/issues/497))
  - Hide/Disable unwanted features from Element: polls, location sharing, analytics(PostHog) ([#404](https://github.com/tchapgouv/tchap-android/issues/404))
 
 

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.3.0"
+    version = "2.3.1"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector/build.gradle b/vector/build.gradle
@@ -18,7 +18,7 @@ ext.versionMinor = 3
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 0
+ext.versionPatch = 1
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

diff --git a/...n/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/...n/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -455,7 +455,8 @@ class MessageActionsViewModel @AssistedInject constructor(
                                  messageContent: MessageContent?,
                                  actionPermissions: ActionPermissions): Boolean {
         // We let reply in thread visible even if threads are not enabled, with an enhanced flow to attract users
-//        if (!vectorPreferences.areThreadMessagesEnabled()) return false
+        // Tchap: don't show the canReplyInThread quick action if it's not enable in the labs
+        if (!vectorPreferences.areThreadMessagesEnabled()) return false
         if (initialState.isFromThreadTimeline) return false
         if (event.root.isThread()) return false
         if (event.root.getClearType() != EventType.MESSAGE &&

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
@@ -230,7 +230,7 @@
     <string name="dialog_title_warning">Attention</string>
     <string name="bottom_action_favourites">Favoris</string>
     <string name="bottom_action_people">Personnes</string> <!-- Tchap: Custom string -->
-    <string name="bottom_action_rooms">Conversations</string> <!-- Tchap: Custom string -->
+    <string name="bottom_action_rooms">Salons</string>
     <string name="home_filter_placeholder_home">Rechercher des conversations</string> <!-- Tchap: Custom string -->
     <string name="invitations_header">Invitations</string>
     <string name="low_priority_header">Priorité basse</string>
@@ -891,8 +891,8 @@
     <string name="send_suggestion_report_placeholder">Décrivez votre suggestion ici</string>
     <string name="send_suggestion_sent">Merci, la suggestion a bien été envoyée</string>
     <string name="send_suggestion_failed">Échec d’envoi de la suggestion (%s)</string>
-    <string name="settings_labs_show_hidden_events_in_timeline">Afficher les évènements cachés dans l’historique</string> <!-- Tchap: Custom string -->
-    <string name="bottom_action_people_x">Conversations privées</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Afficher les événements cachés dans l’historique</string> <!-- Tchap: Custom string -->
+    <string name="bottom_action_people_x">Messages Directs</string> <!-- Tchap: Custom string -->
     <string name="send_file_step_idle">Attente…</string>
     <string name="send_file_step_encrypting_thumbnail">Chiffrement de la miniature…</string>
     <string name="send_file_step_sending_thumbnail">Envoi de la miniature (%1$s / %2$s)</string>