{category,country}/add.html: merge fields' names.

Author: php-coder

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -16,6 +16,8 @@ t_issue_date = Date of release
 t_items = item(s)
 t_wo_perforation_short = without perforation
 t_open_my_collection = Open my collection
+t_name_on_english = Name (on English)
+t_name_on_russian = Name (on Russian)
 
 # header
 t_my_stamps = My stamps
@@ -102,16 +104,12 @@ In order to add this series to your collection you should <a href="{0}">register
 
 # category/add.html
 t_create_category_ucfirst = Add category
-t_category_on_english = Category (on English)
-t_category_on_russian = Category (on Russian)
 
 # category/info.html
 t_category_info = Category info
 
 # country/add.html
 t_add_country_ucfirst = Add country
-t_country_on_english = Country (on English)
-t_country_on_russian = Country (on Russian)
 
 # country/info.html
 t_country_info = Country info

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

@@ -16,6 +16,8 @@ t_issue_date = Дата выпуска
 t_wo_perforation_short = б/з
 t_items = шт.
 t_open_my_collection = Открыть мою коллекцию
+t_name_on_english = Название (на английском)
+t_name_on_russian = Название (на русском)
 
 # шапка
 t_my_stamps = Мои марки
@@ -102,16 +104,12 @@ t_need_authentication_to_add_series_to_collection = \
 
 # category/add.html
 t_create_category_ucfirst = Создать категорию
-t_category_on_english = Категория (на английском)
-t_category_on_russian = Категория (на русском)
 
 # category/info.html
 t_category_info = Информация о категории
 
 # country/add.html
 t_add_country_ucfirst = Добавить страну
-t_country_on_english = Страна (на английском)
-t_country_on_russian = Страна (на русском)
 
 # country/info.html
 t_country_info = Информация о стране

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

@@ -66,8 +66,8 @@ <h3 th:text="#{t_create_category_ucfirst}">
 
 						<div class="form-group" th:classappend="${#fields.hasErrors('name') ? 'has-error' : ''}">
 							<label path="name" class="control-label col-sm-4">
-								<span class="field-label" th:text="#{t_category_on_english}">
-									Category (on English)
+								<span class="field-label" th:text="#{t_name_on_english}">
+									Name (on English)
 								</span>
 								<span id="name.required" class="required_field">*</span>
 							</label>
@@ -79,8 +79,8 @@ <h3 th:text="#{t_create_category_ucfirst}">
 
 						<div class="form-group" th:classappend="${#fields.hasErrors('nameRu') ? 'has-error' : ''}">
 							<label path="nameRu" class="control-label col-sm-4">
-								<span class="field-label" th:text="#{t_category_on_russian}">
-									Category (on Russian)
+								<span class="field-label" th:text="#{t_name_on_russian}">
+									Name (on Russian)
 								</span>
 								<span id="nameRu.required" class="required_field">*</span>
 							</label>

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

@@ -66,8 +66,8 @@ <h3 th:text="#{t_add_country_ucfirst}">
 
 						<div class="form-group" th:classappend="${#fields.hasErrors('name') ? 'has-error' : ''}">
 							<label path="name" class="control-label col-sm-4">
-								<span class="field-label" th:text="#{t_country_on_english}">
-									Country (on English)
+								<span class="field-label" th:text="#{t_name_on_english}">
+									Name (on English)
 								</span>
 								<span id="name.required" class="required_field">*</span>
 							</label>
@@ -79,8 +79,8 @@ <h3 th:text="#{t_add_country_ucfirst}">
 
 						<div class="form-group" th:classappend="${#fields.hasErrors('nameRu') ? 'has-error' : ''}">
 							<label path="nameRu" class="control-label col-sm-4">
-								<span class="field-label" th:text="#{t_country_on_russian}">
-									Country (on Russian)
+								<span class="field-label" th:text="#{t_name_on_russian}">
+									Name (on Russian)
 								</span>
 								<span id="nameRu.required" class="required_field">*</span>
 							</label>