Skip to content
This repository was archived by the owner on Jan 18, 2019. It is now read-only.

Commit f77341f

Browse files
committed
Edit properties
1 parent 04a0815 commit f77341f

File tree

6 files changed

+28
-29
lines changed

6 files changed

+28
-29
lines changed
File renamed without changes.

src/main/resources/messages_en.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
label.firstname=First Name
2-
label.lastname=Last Name
3-
label.email=Email
1+
label.name=First Name
2+
label.surname=Last Name
3+
label.studGroup=Email
44
label.telephone=Telephone
5-
label.addcontact=Add Contact
5+
label.addStudent=Add Contact
66

77
label.menu=Menu
88
label.title=Contact Manager
99
label.footer=© schastny.net
1010

11-
label.contacts=Contacts
11+
label.students=Contacts
1212
label.delete=Delete
1313

1414
label.logout=Logout
Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
label.firstname=Èìÿ
2-
label.lastname=Ôàìèëèÿ
3-
label.email=Email
4-
label.telephone=Òåëåôîí
5-
label.addcontact=Äîáàâèòü êîíòàêò
1+
label.name=Имя
2+
label.surname=Фамилия
3+
label.studGroup=Группа
4+
label.addStudent=Добавить контакт
65

7-
label.menu=Ìåíþ
8-
label.title=Ìåíåäæåð êîíòàêòîâ
6+
label.menu=Меню
7+
label.title=Менеджер контактов
98
label.footer=© schastny.net
109

11-
label.contacts=Êîíòàêòû
12-
label.delete=Óäàëèòü
10+
label.students=Студенты
11+
label.delete=Удалить
1312

14-
label.logout=Âûéòè èç ïðèëîæåíèÿ
15-
label.login=Ëîãèí
16-
label.password=Ïàðîëü
17-
label.remember=Çàïîìíèòü ìåíÿ
18-
label.loginerror=Îøèáêà âõîäà
13+
label.logout=Выйти из приложения
14+
label.login=Логин
15+
label.password=Пароль
16+
label.remember=Запомнить меня
17+
label.loginerror=Ошибка входа

src/main/webapp/WEB-INF/spring/data.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</bean>
1414
<bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
1515
<property name="basename" value="classpath:messages"/>
16-
<property name="defaultEncoding" value="windows-1251"/>
16+
<property name="defaultEncoding" value="utf-8"/>
1717
</bean>
1818
<!--
1919
Настройки бина dataSource будем хранить в отдельном файле

src/main/webapp/WEB-INF/views/student.jsp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,36 @@
2424
<table>
2525
<tr>
2626
<td><form:label path="name">
27-
<spring:message code="label.firstname" />
27+
<spring:message code="label.name" />
2828
</form:label></td>
2929
<td><form:input path="name" /></td>
3030
</tr>
3131
<tr>
3232
<td><form:label path="surname">
33-
<spring:message code="label.lastname" />
33+
<spring:message code="label.surname" />
3434
</form:label></td>
3535
<td><form:input path="surname" /></td>
3636
</tr>
3737
<tr>
3838
<td><form:label path="studGroup">
39-
<spring:message code="label.email" />
39+
<spring:message code="label.studGroup" />
4040
</form:label></td>
4141
<td><form:input path="studGroup" /></td>
4242
</tr>
4343
<tr>
4444
<td colspan="2"><input type="submit"
45-
value="<spring:message code="label.addcontact"/>" /></td>
45+
value="<spring:message code="label.addStudent"/>" /></td>
4646
</tr>
4747
</table>
4848
</form:form>
4949

50-
<h3><spring:message code="label.contacts" /></h3>
50+
<h3><spring:message code="label.students" /></h3>
5151
<c:if test="${!empty studentList}">
5252
<table class="data">
5353
<tr>
54-
<th><spring:message code="label.firstname" /></th>
55-
<th><spring:message code="label.email" /></th>
56-
<th><spring:message code="label.telephone" /></th>
54+
<th><spring:message code="label.name" /></th>
55+
<th><spring:message code="label.surname" /></th>
56+
<th><spring:message code="label.studGroup" /></th>
5757
<th>&nbsp;</th>
5858
</tr>
5959
<c:forEach items="${studentList}" var="student">

src/main/webapp/login.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
<a href="<c:url value="/index" />">
14-
<spring:message code="label.contacts" />
14+
<spring:message code="label.students" />
1515
</a><br/>
1616

1717
<c:if test="${not empty param.error}">

0 commit comments

Comments
 (0)