diff --git a/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.js.coffee b/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.js.coffee index 96f76ed08..d32bed39a 100644 --- a/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.js.coffee +++ b/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.js.coffee @@ -74,8 +74,6 @@ class CalendarSubscriptions extends App.Controller App.User.full( App.Session.get( 'id' ), => - App.i18n.set( @locale ) - App.Event.trigger( 'ui:rerender' ) @notify( type: 'success' msg: App.i18n.translateContent( 'Successfully!' ) @@ -92,4 +90,4 @@ class CalendarSubscriptions extends App.Controller msg: App.i18n.translateContent( data.message ) ) -App.Config.set( 'CalendarSubscriptions', { prio: 4000, name: 'Calendar Subscriptions', parent: '#profile', target: '#profile/calendar_subscriptions', controller: CalendarSubscriptions }, 'NavBarProfile' ) \ No newline at end of file +App.Config.set( 'CalendarSubscriptions', { prio: 3000, name: 'Calendar', parent: '#profile', target: '#profile/calendar_subscriptions', controller: CalendarSubscriptions }, 'NavBarProfile' ) \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/_profile/linked_accounts.js.coffee b/app/assets/javascripts/app/controllers/_profile/linked_accounts.js.coffee index b3475fcb3..07f0bc838 100644 --- a/app/assets/javascripts/app/controllers/_profile/linked_accounts.js.coffee +++ b/app/assets/javascripts/app/controllers/_profile/linked_accounts.js.coffee @@ -76,5 +76,5 @@ class Index extends App.Controller msg: App.i18n.translateContent( data.message ) ) -App.Config.set( 'LinkedAccounts', { prio: 3000, name: 'Linked Accounts', parent: '#profile', target: '#profile/linked', controller: Index }, 'NavBarProfile' ) +App.Config.set( 'LinkedAccounts', { prio: 4000, name: 'Linked Accounts', parent: '#profile', target: '#profile/linked', controller: Index }, 'NavBarProfile' ) diff --git a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco index 56a3d82e3..9c2b2daa3 100644 --- a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco +++ b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco @@ -7,7 +7,7 @@

<%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %>

-

<%= @T('Combined Url') %>

+

<%= @T('URL') %>

<%= @T('Subscription Settings') %>