diff options
Diffstat (limited to 'apps/user_status')
| -rw-r--r-- | apps/user_status/l10n/fr.js | 2 | ||||
| -rw-r--r-- | apps/user_status/l10n/fr.json | 2 | ||||
| -rw-r--r-- | apps/user_status/src/menu.js | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/apps/user_status/l10n/fr.js b/apps/user_status/l10n/fr.js index 4ad763c6852..01abc796d3c 100644 --- a/apps/user_status/l10n/fr.js +++ b/apps/user_status/l10n/fr.js @@ -37,4 +37,4 @@ OC.L10N.register( "Appear offline" : "Apparaitre hors-ligne", "What's your status?" : "Quel est votre statut ?" }, -"nplurals=3; plural=(n==0 || n==1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); +"nplurals=2; plural=(n > 1);"); diff --git a/apps/user_status/l10n/fr.json b/apps/user_status/l10n/fr.json index 8b0dbe805f0..a62900e8f1f 100644 --- a/apps/user_status/l10n/fr.json +++ b/apps/user_status/l10n/fr.json @@ -34,5 +34,5 @@ "Mute all notifications" : "Désactiver toutes les notifications", "Appear offline" : "Apparaitre hors-ligne", "What's your status?" : "Quel est votre statut ?" -},"pluralForm" :"nplurals=3; plural=(n==0 || n==1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" +},"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/user_status/src/menu.js b/apps/user_status/src/menu.js index 98ec1ff06df..c8d007d98a0 100644 --- a/apps/user_status/src/menu.js +++ b/apps/user_status/src/menu.js @@ -27,6 +27,7 @@ import { getRequestToken } from '@nextcloud/auth' import UserStatus from './UserStatus' import store from './store' import Avatar from '@nextcloud/vue/dist/Components/Avatar' +import { loadState } from '@nextcloud/initial-state' // eslint-disable-next-line camelcase __webpack_nonce__ = btoa(getRequestToken()) @@ -35,11 +36,12 @@ Vue.prototype.t = t Vue.prototype.$t = t const avatarDiv = document.getElementById('avatardiv-menu') +const userStatusData = loadState('user_status', 'status') const propsData = { preloadedUserStatus: { - message: avatarDiv.dataset.userstatus_message, - icon: avatarDiv.dataset.userstatus_icon, - status: avatarDiv.dataset.userstatus, + message: userStatusData.message, + icon: userStatusData.icon, + status: userStatusData.status }, user: avatarDiv.dataset.user, displayName: avatarDiv.dataset.displayname, |