Skip to content

Commit f191c63

Browse files
php-coderphp-coder
committed
/series/info: moved number sign from field label to value.
1 parent 87bd97b commit f191c63

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ t_issue_year = Year of release
6161
t_year = Year
6262
t_quantity = Quantity
6363
t_perforated = Perforated
64-
t_michel_no = Michel #
65-
t_scott_no = Scott #
66-
t_yvert_no = Yvert #
67-
t_sg_no = Gibbons #
64+
t_michel = Michel
65+
t_scott = Scott
66+
t_yvert = Yvert
67+
t_sg = Gibbons
6868
t_comment = Comment
6969
t_image = Image
7070

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ t_issue_year = Год выпуска
6161
t_year = Год
6262
t_quantity = Количество
6363
t_perforated = Перфорированная
64-
t_michel_no = Michel #
65-
t_scott_no = Scott #
66-
t_yvert_no = Yvert #
67-
t_sg_no = Gibbons #
64+
t_michel = Michel
65+
t_scott = Scott
66+
t_yvert = Yvert
67+
t_sg = Gibbons
6868
t_comment = Комментарий
6969
t_image = Изображение
7070

‎src/main/webapp/WEB-INF/tiles/body/series/add.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<tr>
8484
<td>
8585
<form:label path="michelNumbers">
86-
<spring:message code="t_michel_no" />
86+
<spring:message code="t_michel" />
8787
</form:label>
8888
</td>
8989
<td></td>
@@ -97,7 +97,7 @@
9797
<tr>
9898
<td>
9999
<form:label path="scottNumbers">
100-
<spring:message code="t_scott_no" />
100+
<spring:message code="t_scott" />
101101
</form:label>
102102
</td>
103103
<td></td>
@@ -111,7 +111,7 @@
111111
<tr>
112112
<td>
113113
<form:label path="yvertNumbers">
114-
<spring:message code="t_yvert_no" />
114+
<spring:message code="t_yvert" />
115115
</form:label>
116116
</td>
117117
<td></td>
@@ -125,7 +125,7 @@
125125
<tr>
126126
<td>
127127
<form:label path="gibbonsNumbers">
128-
<spring:message code="t_sg_no" />
128+
<spring:message code="t_sg" />
129129
</form:label>
130130
</td>
131131
<td></td>

‎src/main/webapp/WEB-INF/tiles/body/series/info.jsp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,40 +57,40 @@
5757
<c:if test="${not empty michelNumbers}">
5858
<tr>
5959
<td>
60-
<spring:message code="t_michel_no" />
60+
<spring:message code="t_michel" />
6161
</td>
6262
<td id="michel_catalog_info">
63-
<c:out value="${michelNumbers}" />
63+
#<c:out value="${michelNumbers}" />
6464
</td>
6565
</tr>
6666
</c:if>
6767
<c:if test="${not empty scottNumbers}">
6868
<tr>
6969
<td>
70-
<spring:message code="t_scott_no" />
70+
<spring:message code="t_scott" />
7171
</td>
7272
<td id="scott_catalog_info">
73-
<c:out value="${scottNumbers}" />
73+
#<c:out value="${scottNumbers}" />
7474
</td>
7575
</tr>
7676
</c:if>
7777
<c:if test="${not empty yvertNumbers}">
7878
<tr>
7979
<td>
80-
<spring:message code="t_yvert_no" />
80+
<spring:message code="t_yvert" />
8181
</td>
8282
<td id="yvert_catalog_info">
83-
<c:out value="${yvertNumbers}" />
83+
#<c:out value="${yvertNumbers}" />
8484
</td>
8585
</tr>
8686
</c:if>
8787
<c:if test="${not empty gibbonsNumbers}">
8888
<tr>
8989
<td>
90-
<spring:message code="t_sg_no" />
90+
<spring:message code="t_sg" />
9191
</td>
9292
<td id="gibbons_catalog_info">
93-
<c:out value="${gibbonsNumbers}" />
93+
#<c:out value="${gibbonsNumbers}" />
9494
</td>
9595
</tr>
9696
</c:if>

‎src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
340340
assertThat(nextPage.getYear()).isEqualTo(expectedYear);
341341
assertThat(nextPage.getQuantity()).isEqualTo(expectedQuantity);
342342
assertThat(nextPage.getPerforated()).isEqualTo(tr("t_no"));
343-
assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("1-3");
344-
assertThat(nextPage.getScottCatalogInfo()).isEqualTo("10-12");
345-
assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("20-22");
346-
assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("30-32");
343+
assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#1-3");
344+
assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#10-12");
345+
assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#20-22");
346+
assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("#30-32");
347347
assertThat(nextPage.getComment()).isEqualTo(expectedComment);
348348
}
349349

@@ -357,7 +357,7 @@ public void shouldIgnoreDuplicatedMichelNumbers() {
357357
assertThat(next).isInstanceOf(InfoSeriesPage.class);
358358

359359
InfoSeriesPage nextPage = (InfoSeriesPage)next;
360-
assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("4, 5");
360+
assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#4, 5");
361361
}
362362

363363
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
@@ -370,7 +370,7 @@ public void shouldIgnoreDuplicatedScottNumbers() {
370370
assertThat(next).isInstanceOf(InfoSeriesPage.class);
371371

372372
InfoSeriesPage nextPage = (InfoSeriesPage)next;
373-
assertThat(nextPage.getScottCatalogInfo()).isEqualTo("14, 15");
373+
assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#14, 15");
374374
}
375375

376376
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
@@ -383,7 +383,7 @@ public void shouldIgnoreDuplicatedYvertNumbers() {
383383
assertThat(next).isInstanceOf(InfoSeriesPage.class);
384384

385385
InfoSeriesPage nextPage = (InfoSeriesPage)next;
386-
assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("24, 25");
386+
assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#24, 25");
387387
}
388388

389389
@Test(groups = "logic", dependsOnGroups = { "std", "valid", "invalid", "misc" })
@@ -396,7 +396,7 @@ public void shouldIgnoreDuplicatedGibbonsNumbers() {
396396
assertThat(next).isInstanceOf(InfoSeriesPage.class);
397397

398398
InfoSeriesPage nextPage = (InfoSeriesPage)next;
399-
assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("34, 35");
399+
assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("#34, 35");
400400
}
401401

402402
@DataProvider(name = "validCatalogNumbers")

‎src/test/java/ru/mystamps/web/tests/page/AddSeriesPage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public AddSeriesPage(WebDriver driver) {
4646
selectField("year").withLabel(tr("t_issue_year")),
4747
required(inputField("quantity").withLabel(tr("t_quantity"))),
4848
checkboxField("perforated").withLabel(tr("t_perforated")),
49-
inputField("michelNumbers").withLabel(tr("t_michel_no")),
50-
inputField("scottNumbers").withLabel(tr("t_scott_no")),
51-
inputField("yvertNumbers").withLabel(tr("t_yvert_no")),
52-
inputField("gibbonsNumbers").withLabel(tr("t_sg_no")),
49+
inputField("michelNumbers").withLabel(tr("t_michel")),
50+
inputField("scottNumbers").withLabel(tr("t_scott")),
51+
inputField("yvertNumbers").withLabel(tr("t_yvert")),
52+
inputField("gibbonsNumbers").withLabel(tr("t_sg")),
5353
textareaField("comment").withLabel(tr("t_comment")),
5454
required(uploadFileField("image").withLabel(tr("t_image")))
5555
)

0 commit comments

Comments
 (0)