Goobi.Production

Merge lp:~slub.team/goobi-production/bug-1028957 into lp:goobi-production/1.8

  1. bug-1028957
  2. Merge into 1.8
Proposed by Ralf Claussnitzer
Status: Merged
Merged at revision: 76
Proposed branch: lp:~slub.team/goobi-production/bug-1028957
Merge into: lp:goobi-production/1.8
Diff against target: 25 lines (+2/-2)
2 files modified
newpages/BenutzerBearbeitenPopup.jsp (+1/-1)
newpages/BenutzerBearbeitenPopupProjekte.jsp (+1/-1)
To merge this branch: bzr merge lp:~slub.team/goobi-production/bug-1028957
Reviewer Review Type Date Requested Status
Saxon State Library Team Pending
Review via email: mp+116718@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'newpages/BenutzerBearbeitenPopup.jsp'
2--- newpages/BenutzerBearbeitenPopup.jsp 2011-12-20 08:07:09 +0000
3+++ newpages/BenutzerBearbeitenPopup.jsp 2012-07-25 18:12:21 +0000
4@@ -121,7 +121,7 @@
5 <%-- Schliessen-Schaltknopf --%>
6 <jp:closePopupFrame>
7 <%-- TODO: Use massage files here --%>
8- <h:commandLink value="schließen"
9+ <h:commandLink value="#{msgs.close}"
10 action="#{NavigationForm.JeniaPopupCloseAction}"></h:commandLink>
11 </jp:closePopupFrame>
12 </htm:td>
13
14=== modified file 'newpages/BenutzerBearbeitenPopupProjekte.jsp'
15--- newpages/BenutzerBearbeitenPopupProjekte.jsp 2011-12-20 08:07:09 +0000
16+++ newpages/BenutzerBearbeitenPopupProjekte.jsp 2012-07-25 18:12:21 +0000
17@@ -112,7 +112,7 @@
18 <%-- Schliessen-Schaltknopf --%>
19 <jp:closePopupFrame>
20 <%-- TODO: Use massage files here --%>
21- <h:commandLink value="schließen"
22+ <h:commandLink value="#{msgs.close}"
23 action="#{NavigationForm.JeniaPopupCloseAction}"></h:commandLink>
24 </jp:closePopupFrame>
25 </htm:td>

Subscribers

People subscribed via source and target branches

to all changes: