Merge branch 'develop' into flescio/1040-poll_detail

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift

RiotSwiftUI/Modules/Room/PollHistory/View/PollHistory.swift

@@ -85,42 +85,32 @@ struct PollHistory: View {
             Button {
                 #warning("handle action in next ticket")
             } label: {
-                Text("Load more polls")
+                Text(VectorL10n.pollHistoryLoadMore)
+                    .font(theme.fonts.body)
             }
             .disabled(viewModel.viewState.isLoading)
         }
     }
     
-    @ViewBuilder
     private var spinner: some View {
         ProgressView()
             .progressViewStyle(CircularProgressViewStyle())
     }
     
-    @ViewBuilder
     private var noPollsView: some View {
-        if viewModel.viewState.canLoadMoreContent {
-            let days = PollHistoryConstants.chunkSizeInDays
-            
-            VStack(spacing: 32) {
-                Text(viewModel.mode == .active ? VectorL10n.pollHistoryNoActivePollPeriodText("\(days)") : VectorL10n.pollHistoryNoPastPollPeriodText("\(days)"))
-                    .font(theme.fonts.body)
-                    .foregroundColor(theme.colors.secondaryContent)
-                    .multilineTextAlignment(.center)
-                    .padding(.horizontal, 16)
-                    .accessibilityIdentifier("PollHistory.emptyLoadMoreText")
-    
-                loadMoreButton
-            }
-            .frame(maxHeight: .infinity)
-        } else {
-            Text(viewModel.mode == .active ? VectorL10n.pollHistoryNoActivePollText : VectorL10n.pollHistoryNoPastPollText)
+        VStack(spacing: 32) {
+            Text(viewModel.emptyPollsText)
                 .font(theme.fonts.body)
+                .multilineTextAlignment(.center)
                 .foregroundColor(theme.colors.secondaryContent)
-                .frame(maxHeight: .infinity)
                 .padding(.horizontal, 16)
                 .accessibilityIdentifier("PollHistory.emptyText")
+
+            if viewModel.viewState.canLoadMoreContent {
+                loadMoreButton
+            }
         }
+        .frame(maxHeight: .infinity)
     }
     
     private var loadingView: some View {