Merge branch 'store-current-search-tab' into 'develop'

Keep selected search results tab See merge request soapbox-pub/soapbox-fe!657
2021-08-03 19:39:09 +00:00 · 2021-08-03 19:39:09 +00:00 · 497b6b08d4
commit 497b6b08d4
parent ad2db4e7bc f8dcafae98
6 changed files with 1 additions and 0 deletions
--- a/app/soapbox/actions/search.js
+++ b/app/soapbox/actions/search.js
--- a/app/soapbox/features/compose/components/search_results.js
+++ b/app/soapbox/features/compose/components/search_results.js
--- a/app/soapbox/features/compose/containers/search_results_container.js
+++ b/app/soapbox/features/compose/containers/search_results_container.js
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@ -188,6 +188,7 @@
  "column.public": "Globalna oś czasu",
  "column.remote": "Sfederowana oś czasu",
  "column.scheduled_statuses": "Zaplanowane wpisy",
+  "column.search": "Szukaj",
  "column.security": "Bezpieczeństwo",
  "column.soapbox_config": "Konfiguracja Soapbox",
  "column_back_button.label": "Wróć",
--- a/app/soapbox/reducers/tests/search-test.js
+++ b/app/soapbox/reducers/tests/search-test.js
--- a/app/soapbox/reducers/search.js
+++ b/app/soapbox/reducers/search.js