Commit 2e4d0234 by Tuomas Riihimäki

Calendarbugia

1 parent b136d3e6
...@@ -250,7 +250,7 @@ public class BillBean implements BillBeanLocal { ...@@ -250,7 +250,7 @@ public class BillBean implements BillBeanLocal {
} }
MailMessage msg = new MailMessage(); MailMessage msg = new MailMessage();
msg.setSubject(I18n.get("bill.billMarkedPaidMail.subject")); msg.setSubject(I18n.get("bill.billMarkedPaidMail.subject", user.getEvent().getName()));
msg.setMessage(I18n.get("bill.billMarkedPaidMail.message", (bill.getBillNumber() == null) ? "----" : bill.getBillNumber().toString())); msg.setMessage(I18n.get("bill.billMarkedPaidMail.message", (bill.getBillNumber() == null) ? "----" : bill.getBillNumber().toString()));
msg.setTo(bill.getUser().getUser()); msg.setTo(bill.getUser().getUser());
utilbean.sendMail(msg); utilbean.sendMail(msg);
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
</session-config> </session-config>
<context-param> <context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name> <param-name>javax.faces.PROJECT_STAGE</param-name>
<!-- <param-value>Production</param-value>--> <param-value>Production</param-value>
<param-value>Development</param-value> <!-- <param-value>Development</param-value> -->
</context-param> </context-param>
<context-param> <context-param>
......
...@@ -143,11 +143,14 @@ ...@@ -143,11 +143,14 @@
value="#{i18n['user.birthday']}" /><br /> value="#{i18n['user.birthday']}" /><br />
<p:inplace emptyLabel="#{i18n['user.insert']}"> <p:inplace emptyLabel="#{i18n['user.insert']}">
<p:calendar <p:calendar id="birthday" navigator="true" yearRange="c-80:c-0"
id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi"
value="#{userView.selectedUser.birthday}" value="#{userView.selectedUser.birthday}"
pattern="#{sessionHandler.dateFormat}" >
timeZone="#{sessionHandler.timezone}" /></p:inplace> <h:message <f:convertDateTime pattern="#{sessionHandler.dateFormat}"
timeZone="#{sessionHandler.timezone}" />
</p:calendar>
</p:inplace>
<h:message
for="birthday" /></td> for="birthday" /></td>
<td><h:outputLabel value="#{i18n['user.sex']}" for="sex" /> <td><h:outputLabel value="#{i18n['user.sex']}" for="sex" />
<br /> <br />
......
...@@ -444,8 +444,8 @@ passwordChanged.header = Password changed successfully. ...@@ -444,8 +444,8 @@ passwordChanged.header = Password changed successfully.
passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator. passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
passwordReset.hashNotFound = Password change token has expired. Please send the query again. passwordReset.hashNotFound = Password change token has expired. Please send the query again.
passwordreset.mailBody = You can change your password in address: {0}\n\nIf you have not requested password reset, ignore this message.\n\nStream intranet\nwww.streamparty.org\ninfo@streamparty.org passwordreset.mailBody = You can change your password in address\: {0}\n\nIf you have not requested password reset, ignore this message.\n\n
passwordreset.mailSubject = [STREAM] Password reset passwordreset.mailSubject = [{0}] Password reset
passwordreset.usernotfound = Username not found. Please note that username is case sensitive. passwordreset.usernotfound = Username not found. Please note that username is case sensitive.
permissiondenied.alreadyLoggedIn = You don't have enough rights permissiondenied.alreadyLoggedIn = You don't have enough rights
......
...@@ -988,11 +988,11 @@ user.accountEvents=Tilitapahtumat ...@@ -988,11 +988,11 @@ user.accountEvents=Tilitapahtumat
bill.billMarkedPaidMail.subject=[INSOMNIA] Lasku merkitty maksetuksi bill.billMarkedPaidMail.subject=[{0}] Lasku merkitty maksetuksi
bill.billMarkedPaidMail.message=Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u2030 lippukauppaan varamaamaan haluamasi paikat. \nTervetuloa tapahtumaan!\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi bill.billMarkedPaidMail.message=Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u2030 lippukauppaan varamaamaan haluamasi paikat. \nTervetuloa tapahtumaan!\n\n
...@@ -1000,7 +1000,7 @@ passwordreset.usernotfound=Annettua k\u2030ytt\u2030j\u2030tunnusta ei l\u02C6yd ...@@ -1000,7 +1000,7 @@ passwordreset.usernotfound=Annettua k\u2030ytt\u2030j\u2030tunnusta ei l\u02C6yd
passwordreset.mailSubject=[INSOMNIA] Salasanan vaihtaminen passwordreset.mailSubject=[{0}] Salasanan vaihtaminen
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!