LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Weitere Korrekturen an PublicPersonalProfile 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1167 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-10-13 16:54:58 +00:00
parent 5428418dbc
commit 18dfe49596
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
View File

@ -85,13 +85,8 @@ public class PublicPersonalProfileXmlUtil {
navHome.addAttribute("isSelected", "false"); navHome.addAttribute("isSelected", "false");
} }
navHome.addAttribute("sortKey", ""); navHome.addAttribute("sortKey", "");
<<<<<<< .mine
String homeLabel = homeLabels.get(DispatcherHelper.getNegotiatedLocale(). String homeLabel = homeLabels.get(GlobalizationHelper.getNegotiatedLocale().getLanguage());
=======
String homeLabel = homeLabels.get(GlobalizationHelper.
getNegotiatedLocale().
>>>>>>> .r1165
getLanguage());
if (homeLabel == null) { if (homeLabel == null) {
navHome.addAttribute("title", "Home"); navHome.addAttribute("title", "Home");
} else { } else {