Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #306 from zanata/rhbz1023227
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Dec 2, 2013
2 parents 78a08e9 + 73057f0 commit 6ff5dd9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion zanata-war/src/main/resources/messages.properties
Expand Up @@ -912,7 +912,7 @@ jsf.email.coordinator.ReceivedReason=You are coordinator in '#{sendEmail.locale.
#------ request-to-join-language email ------
jsf.email.joinrequest.UserRequestingToJoin=Zanata user '#{sendEmail.fromName}' with id '#{sendEmail.fromLoginName}' is requesting to join the #{sendEmail.locale.localeId.id} (#{sendEmail.locale.retrieveNativeName()}) Language Team
jsf.email.joinrequest.AddUserInstructions=You can add #{sendEmail.fromName} to the #{sendEmail.locale.localeId.id} team as translator using the "#{messages['jsf.AddTeamMember']}" action on the language team page and searching for '#{sendEmail.fromLoginName}'.
jsf.email.joinrequest.RoleRequested=Role requested:
jsf.email.joinrequest.RoleRequested=Roles requested:

#------ request-role-language email ------
jsf.email.rolerequest.UserRequestingRole=Zanata user '#{sendEmail.fromName}' with id '#{sendEmail.fromLoginName}' is requesting the following role in #{sendEmail.locale.localeId.id} (#{sendEmail.locale.retrieveNativeName()}) Language Team:
Expand Down
Expand Up @@ -20,7 +20,8 @@
<p>
#{messages['jsf.email.joinrequest.UserRequestingToJoin']}
<s:fragment rendered="#{languageJoinUpdateRoleAction.hasRoleRequest()}">
<br/>#{messages['jsf.email.joinrequest.RoleRequested']}
<br/><h:outputText
value="#{messages['jsf.email.joinrequest.RoleRequested']}"/>
<ul>
<s:fragment
rendered="#{languageJoinUpdateRoleAction.requestAsTranslator}">
Expand Down

0 comments on commit 6ff5dd9

Please sign in to comment.