Skip to content

improve: add Russian translation for catalog names #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2020
Merged

improve: add Russian translation for catalog names #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67ef64f
chore: add Russian translation for catalog names
demianova Apr 29, 2020
fcbfc64
chore: use full English names for catalogs
demianova Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/resources/ru/mystamps/i18n/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ t_import_series = import a series
t_date = Date
t_michel = Michel
t_scott = Scott
t_yvert = Yvert
t_sg = Gibbons
t_yvert = Yvert et Tellier
t_sg = Stanley Gibbons
t_solovyov = Solovyov
t_zagorski = Zagorski
t_not_chosen = Not chosen
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/ru/mystamps/i18n/Messages_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ t_url = Ссылка
t_add_buyer_seller = добавить продавца/покупателя
t_import_series = импортировать серию
t_date = Дата
t_michel = Michel
t_scott = Scott
t_yvert = Yvert
t_sg = Gibbons
t_michel = Михель
t_scott = Скотт
t_yvert = Ивер и Телье
t_sg = Стэнли Гиббонс
t_solovyov = Соловьев
t_zagorski = Загорский
t_not_chosen = Не выбрана
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/series/add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">

<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${yvertHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
<label for="yvertNumbers" class="control-label col-sm-3" th:text="#{t_yvert}">
Yvert
Yvert et Tellier
</label>
<div class="col-sm-7">
<div class="row">
Expand All @@ -446,7 +446,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">

<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${gibbonsHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
<label for="gibbonsNumbers" class="control-label col-sm-3" th:text="#{t_sg}">
Gibbons
Stanley Gibbons
</label>
<div class="col-sm-7">
<div class="row">
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/series/info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@

<!--/*/ <th:block th:if="${not #strings.isEmpty(yvertNumbers) or series.yvert.price != null}"> /*/-->
<dt th:text="#{t_yvert}">
Yvert
Yvert et Tellier
</dt>
<dd id="yvert_catalog_info"
th:with="showNumbers=${not #strings.isEmpty(yvertNumbers)},showPrice=${series.yvert.price != null}">
Expand All @@ -295,7 +295,7 @@

<!--/*/ <th:block th:if="${not #strings.isEmpty(gibbonsNumbers) or series.gibbons.price != null}"> /*/-->
<dt th:text="#{t_sg}">
Gibbons
Stanley Gibbons
</dt>
<dd id="gibbons_catalog_info"
th:with="showNumbers=${not #strings.isEmpty(gibbonsNumbers)},showPrice=${series.gibbons.price != null}">
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/views/site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ <h4 class="panel-title" th:text="#{t_search_by_catalog}">Search by catalog</h4>
<select id="catalogName" name="catalogName" class="form-control">
<option value="michel" th:text="#{t_michel}">Michel</option>
<option value="scott" th:text="#{t_scott}">Scott</option>
<option value="yvert" th:text="#{t_yvert}">Yvert</option>
<option value="gibbons" th:text="#{t_sg}">Gibbons</option>
<option value="yvert" th:text="#{t_yvert}">Yvert et Tellier</option>
<option value="gibbons" th:text="#{t_sg}">Stanley Gibbons</option>
<option value="solovyov" th:text="#{t_solovyov}">Solovyov</option>
<option value="zagorski" th:text="#{t_zagorski}">Zagorski</option>
</select>
Expand Down