Skip to content

Commit

Permalink
[I18n] App name parametrized
Browse files Browse the repository at this point in the history 
-Locanda name is now a property that can be promptly changed for an easy
forking
-Obsolete JSPs removed
  • Loading branch information
guido committed May 29, 2013
1 parent f9b608e commit ddd27a2
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 103 deletions.
8 changes: 5 additions & 3 deletions src/global.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ createAccount = Create Account

createAccountSuccess = Account created successfully

createAccountSuccessMessage = Congratulation! Your account has been created successfully. Now you are able to log in to locanda by using the following data
createAccountSuccessMessage = Congratulation! Your account has been created successfully. Now you are able to log in to <s:text name="title"/> by using the following data

currentVersion = 0.3
currentVersion = 0.4

customer = Customer

Expand Down Expand Up @@ -479,7 +479,9 @@ thisFileMandatory = This Field is Mandatory

thursday = Thursday

title = Locanda - The Open Source Booking Software
title = Locanda

titleExtended = Locanda - The Open Source Booking Software

to = To

Expand Down
2 changes: 0 additions & 2 deletions src/global_es.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,6 @@ thisFileMandatory = campo obligatorio

thursday = Jueves

title = locanda reserva de hoteles

to = A

total = Total cuenta
Expand Down
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/contents/guests_form.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<link rel="stylesheet" type='text/css' href="css/jquery.fileupload-ui.css" />
<link rel="stylesheet" type="text/css" href="css/layout_sliding_door.css" />

<title>LOCANDA - Open Source Booking Tool</title>
<title><s:text name="titleExtended"/></title>

<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
<!--[if lte IE 7]>
Expand Down
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/createAccount-input.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<s:url action="createAccount" var="url_createAccount"></s:url>
<jsp:include page="layout/header.jsp" />
<div id="home">
<h1>Locanda - <s:text name="createAccount"/></h1>
<h1><s:text name="title"/> - <s:text name="createAccount"/></h1>
<p><s:text name="homeWelcomeMessage"/>.</p>
<s:actionerror/><s:fielderror></s:fielderror>

Expand Down
4 changes: 2 additions & 2 deletions webroot/WEB-INF/jsp/createAccount-output.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<s:url action="createAccount" var="url_createAccount"></s:url>
<jsp:include page="layout/header.jsp"/>
<div id="home">
<h1>Locanda - <s:text name="createAccountSuccess"/></h1>
<h1><s:text name="title"/> - <s:text name="createAccountSuccess"/></h1>
<p><s:text name="createAccountSuccessMessage"/>:</p>
<p>
Email: <s:property value="user.email" /><br></br>
Password: locanda
Password: <s:text name="title"/>
</p>
<p id="home_images"></p>
</div>
Expand Down
57 changes: 0 additions & 57 deletions webroot/WEB-INF/jsp/download.jsp
View file

This file was deleted.

26 changes: 0 additions & 26 deletions webroot/WEB-INF/jsp/footer.jsp
View file

This file was deleted.

4 changes: 1 addition & 3 deletions webroot/WEB-INF/jsp/layout/footer.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
<img src="images/european_union.png" id="eu" alt="European Union" class="right" height="7%" width="7%" />
<img src="images/repubblica.png" alt="Repubblica Italiana" class="right" height="7%" width="7%"/>
<img src="images/regione_sardegna.png" alt="Regione Autonoma della Sardegna" class="right" height="7%" width=7%/>
<span class="center">Locanda<br/>
Open Source Booking<br/><br/>
</span>
<span class="center"><s:text name="titleExtended"/><br/><br/><br/></span>
</div>
<!-- end: #footer -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/layout/header.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<link type='text/css' href='css/south-street/jquery-ui-1.8.9.custom.css' rel='stylesheet' />
<link type="text/css" href="css/layout_sliding_door.css" rel="stylesheet" />
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png">
<title>LOCANDA - Open Source Booking Tool</title><!-- (en) Add your meta data here -->
<title><s:text name="titleExtended"/></title><!-- (en) Add your meta data here -->

<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
<!--[if lte IE 7]>
Expand Down
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/layout/header_menu.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<link rel="stylesheet" type='text/css' href="css/jquery.fileupload-ui.css" />
<link rel="stylesheet" type="text/css" href="css/layout_sliding_door.css" />
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png">
<title>LOCANDA - Open Source Booking Tool</title>
<title><s:text name="titleExtended"/></title>

<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
<!--[if lte IE 7]>
Expand Down
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/online/validationError.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div><!-- /content -->

<div data-role="footer">
<h4>Locanda <s:text name="onlineWidget"/></h4>
<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
</div><!-- /header -->

</div><!-- /page -->
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/online/widget1.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@
</div><!-- /content -->

<div data-role="footer">
<h4>Locanda <s:text name="onlineWidget"/></h4>
<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
</div><!-- /header -->
</div><!-- /page -->
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/online/widget2.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
</div><!-- /content -->

<div data-role="footer">
<h4>Locanda <s:text name="onlineWidget"/></h4>
<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
</div><!-- /header -->
</div>
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/online/widget3.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
</div><!-- /content -->

<div data-role="footer">
<h4>Locanda <s:text name="onlineWidget"/></h4>
<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
</div><!-- /header -->
</div><!-- /page -->
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/online/widget4.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
</div><!-- /content -->

<div data-role="footer">
<h4>Locanda <s:text name="onlineWidget"/></h4>
<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
</div><!-- /header -->
</div><!-- /page -->
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/online/widget5.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@
</div>
</div><!-- /content -->
<div data-role="footer">
<h4>Locanda <s:text name="onlineWidget"/></h4>
<h4><s:text name="title"/> <s:text name="onlineWidget"/></h4>
</div><!-- /header -->
</div><!-- /page -->

0 comments on commit ddd27a2

Please sign in to comment.