Skip to content

Commit

Permalink
fix label issue for ng titles
Browse files Browse the repository at this point in the history
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
  • Loading branch information
georgehrke committed Jan 10, 2018
1 parent 38592ad commit 37069d1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 3 additions & 0 deletions js/app/controllers/calendarlistcontroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ app.controller('CalendarListController', ['$scope', '$rootScope', '$window', 'Ha
$scope.subscription.newSubscriptionLocked = false;
$scope.publicdav = 'CalDAV';
$scope.publicdavdesc = t('calendar', 'CalDAV address for clients');
$scope.warningLabel = t('calendar', 'Some events in this calendar are broken. Please check the JS console for more info.');
$scope.shareLabel = t('calendar', 'Share Calendar');
$scope.sharedLabel = t('calendar', 'Shared');

$scope.isSharingAPI = isSharingAPI;
$scope.canSharePublicLink = constants.canSharePublicLink;
Expand Down
8 changes: 2 additions & 6 deletions templates/part.calendarlist.item.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@
ng-class="{'icon-error': item.calendar.hasWarnings()}"
href="#"
ng-click="triggerEnable(item)"
title="{{
item.calendar.hasWarnings()
? '<?php p($l->t('Some events in this calendar are broken. Please check the JS console for more info.')); ?>'
:item.calendar.displayname
}}">
title="{{ item.calendar.hasWarnings() ? warningLabel : item.calendar.displayname }}">
{{ item.calendar.displayname }}
</span>
</a>
Expand All @@ -50,7 +46,7 @@
'icon-shared shared-style': item.calendar.isShared() && !item.calendar.isPublished(),
'icon-public': item.calendar.isPublished(),
'icon-shared': !item.calendar.isShared() && !item.calendar.isPublished()}"
title="{{item.calendar.isShared() && item.calendar.isShareable() || item.calendar.isPublished() ? '<?php p($l->t('Shared'))?>' : '<?php p($l->t('Share Calendar')) ?>'}}">
title="{{item.calendar.isShared() && item.calendar.isShareable() || item.calendar.isPublished() ? sharedLabel : shareLabel}}">
</button>
</li>
<li class="app-navigation-entry-utils-menu-button"
Expand Down

0 comments on commit 37069d1

Please sign in to comment.