Skip to content

Commit 008442a

Browse files
committed
feat(/series/add): when suggesting a country, show its name.
1 parent 4f22521 commit 008442a

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

src/main/java/ru/mystamps/web/Url.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public final class Url {
9090
public static final String ADD_SERIES_WITH_COUNTRY_PAGE = "/series/add/country/{slug}";
9191

9292
// MUST be updated when any of our resources were modified
93-
public static final String RESOURCES_VERSION = "v0.3.9";
93+
public static final String RESOURCES_VERSION = "v0.3.10";
9494

9595
// CheckStyle: ignore LineLength for next 7 lines
9696
public static final String MAIN_CSS = "/static/" + RESOURCES_VERSION + "/styles/main.min.css";

src/main/javascript/series/add.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ function initPage(suggestCountryUrl) {
3939
suggestCountryLink.addClass('hidden');
4040
chooseCountryBySlug(slug);
4141
});
42+
43+
var countryName = getCountryNameBySlug(slug);
44+
var newText = suggestCountryLink.text().replace('%name%', countryName);
45+
suggestCountryLink.text(newText);
46+
4247
suggestCountryLink.removeClass('hidden');
4348
});
4449
}
@@ -49,3 +54,9 @@ function chooseCountryBySlug(slug) {
4954
var selectize = countrySelectBox[0].selectize;
5055
selectize.setValue(slug);
5156
}
57+
58+
function getCountryNameBySlug(slug) {
59+
var countrySelectBox = $('#country').selectize();
60+
var selectize = countrySelectBox[0].selectize;
61+
return selectize.options[slug].text;
62+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ t_image = Image
129129
t_add_more_images_hint = Later you will be able to add additional images
130130
t_create_category_hint = You can also <a tabindex="-1" href="{0}">add a new category</a>
131131
t_create_country_hint = You can also <a tabindex="-1" href="{0}">add a new country</a>
132-
t_guess_country = Guess a country
132+
t_pick_percent_name = Pick "%name%"
133133

134134
# series/info.html
135135
t_series_info = Info about series

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ t_image = Изображение
128128
t_add_more_images_hint = Вы сможете добавить дополнительные изображения позже
129129
t_create_category_hint = Вы также можете <a tabindex="-1" href="{0}">добавить новую категорию</a>
130130
t_create_country_hint = Вы также можете <a tabindex="-1" href="{0}">добавить новую страну</a>
131-
t_guess_country = Угадать страну
131+
t_pick_percent_name = Выбрать "%name%"
132132

133133
# series/info.html
134134
t_series_info = Информация о серии

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ <h3 th:text="${#strings.capitalize(add_series)}">
172172

173173
<small togglz:active="SHOW_SUGGESTION_LINK">
174174
<a tabindex="-1"
175-
th:text="#{t_guess_country}"
175+
th:text="#{t_pick_percent_name}"
176176
href="javascript:$('#js-suggest-country-link').hide(); chooseCountryBySlug('russia'); void(0)"
177177
th:href="'javascript:void(0)'"
178178
id="js-suggest-country-link"
179179
class="link-vcenter"
180-
th:classappend="hidden">Guess a country</a>
180+
th:classappend="hidden">Pick "Russia"</a>
181181
</small>
182182
</div>
183183

0 commit comments

Comments
 (0)