Fix lost of request parameters after changing a language.

Fix #519

Author: php-coder

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -378,8 +378,8 @@ public String processAskForm(
 
 	@GetMapping(Url.SEARCH_SERIES_BY_CATALOG)
 	public String searchSeriesByCatalog(
-		@RequestParam("catalogNumber") String catalogNumber,
-		@RequestParam("catalogName") String catalogName,
+		@RequestParam(name = "catalogNumber", defaultValue = "") String catalogNumber,
+		@RequestParam(name = "catalogName", defaultValue = "") String catalogName,
 		Model model,
 		Locale userLocale,
 		RedirectAttributes redirectAttributes)

src/main/webapp/WEB-INF/views/account/activate.html

@@ -47,14 +47,20 @@
 							<li th:case="'ru'">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="en"></span>
-									<a href="?lang=en" hreflang="en" th:text="#{t_english}">English</a>
+									<a href="?lang=en"
+										hreflang="en"
+										th:href="@{${ACTIVATE_ACCOUNT_PAGE}(key=${param.key},lang=en)}"
+										th:text="#{t_english}">English</a>
 								</div>
 							</li>
 							/*/-->
 							<li th:case="*">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="ru"></span>
-									<a href="?lang=ru" hreflang="ru" th:text="#{t_russian}">Russian</a>
+									<a href="?lang=ru"
+										hreflang="ru"
+										th:href="@{${ACTIVATE_ACCOUNT_PAGE}(key=${param.key},lang=ru)}"
+										th:text="#{t_russian}">Russian</a>
 								</div>
 							</li>
 						</ul>

src/main/webapp/WEB-INF/views/series/add.html

@@ -48,14 +48,20 @@
 							<li th:case="'ru'">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="en"></span>
-									<a href="?lang=en" hreflang="en" th:text="#{t_english}">English</a>
+									<a href="?lang=en"
+										hreflang="en"
+										th:href="@{${ADD_SERIES_PAGE}(category=${param.category},country=${param.country},lang=en)}"
+										th:text="#{t_english}">English</a>
 								</div>
 							</li>
 							/*/-->
 							<li th:case="*">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="ru"></span>
-									<a href="?lang=ru" hreflang="ru" th:text="#{t_russian}">Russian</a>
+									<a href="?lang=ru"
+										hreflang="ru"
+										th:href="@{${ADD_SERIES_PAGE}(category=${param.category},country=${param.country},lang=ru)}"
+										th:text="#{t_russian}">Russian</a>
 								</div>
 							</li>
 						</ul>

src/main/webapp/WEB-INF/views/series/search_result.html

@@ -47,14 +47,20 @@
 							<li th:case="'ru'">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="en"></span>
-									<a href="?lang=en" hreflang="en" th:text="#{t_english}">English</a>
+									<a href="?lang=en"
+										hreflang="en"
+										th:href="@{${SEARCH_SERIES_BY_CATALOG}(catalogNumber=${param.catalogNumber},catalogName=${param.catalogName},lang=en)}"
+										th:text="#{t_english}">English</a>
 								</div>
 							</li>
 							/*/-->
 							<li th:case="*">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="ru"></span>
-									<a href="?lang=ru" hreflang="ru" th:text="#{t_russian}">Russian</a>
+									<a href="?lang=ru"
+										hreflang="ru"
+										th:href="@{${SEARCH_SERIES_BY_CATALOG}(catalogNumber=${param.catalogNumber},catalogName=${param.catalogName},lang=ru)}"
+										th:text="#{t_russian}">Russian</a>
 								</div>
 							</li>
 						</ul>

src/main/webapp/WEB-INF/views/site/events.html

@@ -47,14 +47,20 @@
 							<li th:case="'ru'">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="en"></span>
-									<a href="?lang=en" hreflang="en" th:text="#{t_english}">English</a>
+									<a href="?lang=en"
+										hreflang="en"
+										th:href="@{${SITE_EVENTS_PAGE}(page=${param.page},lang=en)}"
+										th:text="#{t_english}">English</a>
 								</div>
 							</li>
 							/*/-->
 							<li th:case="*">
 								<div class="dropdown-entry-lang">
 									<span class="lang-xs" lang="ru"></span>
-									<a href="?lang=ru" hreflang="ru" th:text="#{t_russian}">Russian</a>
+									<a href="?lang=ru"
+										hreflang="ru"
+										th:href="@{${SITE_EVENTS_PAGE}(page=${param.page},lang=ru)}"
+										th:text="#{t_russian}">Russian</a>
 								</div>
 							</li>
 						</ul>