@kalisio/kdk 1.4.2 → 1.6.0

package/lib/core/client/components/layout/KAbout.vue

@@ -24,55 +24,53 @@
       id="about"
       ref="about"
       :buttons="getButtons()">
-      <div slot="modal-content">
-        <div class="column justify-center">
-          <!-- Banner -->
-          <div v-if="banner" class="q-pa-md row justify-center"><img class="screen-banner" :src="banner"></div>
-          <!-- Version -->
-          <div id="version-numbers" class="row justify-center">
-            <cite v-if="clientVersionName">{{ $t('KAbout.CLIENT_VERSION') }}{{ clientVersionName }}</cite>
-            <cite v-if="apiVersionName">&nbsp;-&nbsp;{{ $t('KAbout.API_VERSION') }}{{ apiVersionName }}</cite>
-          </div>
-          <div id="hosting" class="row justify-center">
-            <cite>{{ $t('KAbout.DOMAIN') }} <a :href="$config('domain')" target="_blank">{{ $config('domain') }}</a></cite>
-            <cite>&nbsp;({{ $config('flavor') }})</cite>
-          </div><br/>
-          <!-- More info -->
-          <div class="row justify-center">
-            <a id="app-website" :href="$config('appWebsite')" target="_blank">
-              <q-icon name="las la-external-link-alt"/>&nbsp;{{ $t('KAbout.MORE') }} {{ $config('appName') }}
-            </a>
-          </div><br/>
-          <div class="row justify-center">
-            <a id="publisher-website" :href="$config('publisherWebsite')" target="_blank">
-              <q-icon name="las la-external-link-alt"/>&nbsp;{{ $t('KAbout.MORE_PUBLISHER') }} {{ $config('publisher') }}
-            </a>
-          </div><br/>
-          <!-- Bug report -->
-          <div class="row justify-center">
-            <a id="report-bug" :href="`mailto:${bugReport.address}?subject=${bugReport.subject}&body=${bugReport.body}`">
-              <q-icon name="las la-envelope"/>&nbsp;{{ $t('KAbout.BUG_REPORT') }}
-            </a>
-          </div><br/>
-          <!-- System -->
-          <div class="row justify-center" @click="showSystemDetails = !showSystemDetails">
-            <a id="system-details" >
-              <q-icon name="las la-laptop-code"/>&nbsp;{{ $t('KAbout.SYSTEM_DETAILS') }}
-            </a>
-          </div>
-          <br/>
-          <div v-show="showSystemDetails">
-            <template v-for="(value, key) in systemDetails">
-              <div :key="key" class="row justify-center">
-                <cite><strong>{{ key }}</strong>: {{ value }}</cite>
-              </div>
-            </template>
-          </div>
-          <!-- KDK -->
-          <div class="row justify-center items-center q-gutter-x-md">
-            <q-icon name="kdk:kdk.png" size="md" />
-            <a href="https://kalisio.github.io/kdk" target="_blank">{{ $t('KAbout.KDK_POWERED') }}</a>
-          </div>
+      <div class="column justify-center">
+        <!-- Banner -->
+        <div v-if="banner" class="q-pa-md row justify-center"><img class="screen-banner" :src="banner"></div>
+        <!-- Version -->
+        <div id="version-numbers" class="row justify-center">
+          <cite v-if="clientVersionName">{{ $t('KAbout.CLIENT_VERSION') }}{{ clientVersionName }}</cite>
+          <cite v-if="apiVersionName">&nbsp;-&nbsp;{{ $t('KAbout.API_VERSION') }}{{ apiVersionName }}</cite>
+        </div>
+        <div id="hosting" class="row justify-center">
+          <cite>{{ $t('KAbout.DOMAIN') }} <a :href="$config('domain')" target="_blank">{{ $config('domain') }}</a></cite>
+          <cite>&nbsp;({{ $config('flavor') }})</cite>
+        </div><br/>
+        <!-- More info -->
+        <div class="row justify-center">
+          <a id="app-website" :href="$config('appWebsite')" target="_blank">
+            <q-icon name="las la-external-link-alt"/>&nbsp;{{ $t('KAbout.MORE') }} {{ $config('appName') }}
+          </a>
+        </div><br/>
+        <div class="row justify-center">
+          <a id="publisher-website" :href="$config('publisherWebsite')" target="_blank">
+            <q-icon name="las la-external-link-alt"/>&nbsp;{{ $t('KAbout.MORE_PUBLISHER') }} {{ $config('publisher') }}
+          </a>
+        </div><br/>
+        <!-- Bug report -->
+        <div class="row justify-center">
+          <a id="report-bug" :href="`mailto:${bugReport.address}?subject=${bugReport.subject}&body=${bugReport.body}`">
+            <q-icon name="las la-envelope"/>&nbsp;{{ $t('KAbout.BUG_REPORT') }}
+          </a>
+        </div><br/>
+        <!-- System -->
+        <div class="row justify-center" @click="showSystemDetails = !showSystemDetails">
+          <a id="system-details" >
+            <q-icon name="las la-laptop-code"/>&nbsp;{{ $t('KAbout.SYSTEM_DETAILS') }}
+          </a>
+        </div>
+        <br/>
+        <div v-show="showSystemDetails">
+          <template v-for="(value, key) in systemDetails">
+            <div :key="key" class="row justify-center">
+              <cite><strong>{{ key }}</strong>: {{ value }}</cite>
+            </div>
+          </template>
+        </div>
+        <!-- KDK -->
+        <div class="row justify-center items-center q-gutter-x-md">
+          <q-icon name="kdk:kdk.png" size="md" />
+          <a href="https://kalisio.github.io/kdk" target="_blank">{{ $t('KAbout.KDK_POWERED') }}</a>
         </div>
       </div>
     </k-modal>

package/lib/core/client/components/team/KAddMember.vue

@@ -5,7 +5,7 @@
     v-model="isModalOpened"
     @opened="$emit('opened')"
     @closed="$emit('closed')">
-    <div slot="modal-content">
+    <div>
       <q-tabs  align="justify" v-model="mode" inverted>
         <q-tab id="unique-tab" name="unique" icon="las la-user"  />
         <q-tab id="multiple-tab" name="multiple" icon="las la-user-friends"  />

package/lib/core/client/components/team/KChangeRole.vue

@@ -5,10 +5,9 @@
     :buttons="getButtons()"
     v-model="isModalOpened"
     @opened="$emit('opened')"
-    @closed="$emit('closed')">
-    <div slot="modal-content" class="column xs-gutter">
-      <k-form v-if="member" ref="form" :schema="getSchema()" />
-    </div>
+    @closed="$emit('closed')"
+  >
+    <k-form v-if="member" ref="form" :schema="getSchema()" />
   </k-modal>
 </template>
 
@@ -61,12 +60,8 @@ export default {
       const scope = this.getScope()
       const resourceId = this.getResourceId()
       const currentRole = _.get(_.find(this.member[scope], { _id: resourceId }), 'permissions')
-      const roles = [
-        { label: this.$t('KChangeRole.MEMBER_LABEL'), value: 'member' },
-        { label: this.$t('KChangeRole.MANAGER_LABEL'), value: 'manager' },
-        { label: this.$t('KChangeRole.OWNER_LABEL'), value: 'owner' }
-      ]
-      _.remove(roles, role => { return role.value === currentRole })
+      const roles = ['member', 'manager']
+      if (this.getScope() === 'organisations') roles.push('owner')
       return {
         $schema: 'http://json-schema.org/draft-06/schema#',
         $id: 'http://kalisio.xyz/schemas/change-role#',
@@ -74,11 +69,11 @@ export default {
         properties: {
           role: {
             type: 'string',
+            default: currentRole,
             field: {
-              component: 'form/KSelectField',
+              component: 'form/KRoleField',
               label: 'KChangeRole.ROLE_FIELD_LABEL',
-              type: 'radio',
-              options: roles
+              roles
             }
           }
         },
@@ -110,10 +105,12 @@ export default {
       }
     }
   },
-  async created () {
+  beforeCreate () {
     // Load the required components
     this.$options.components['k-modal'] = this.$load('frame/KModal')
     this.$options.components['k-form'] = this.$load('form/KForm')
+  },
+  async created () {
     // Load the member
     this.member = await this.loadObject()
   }

package/lib/core/client/components/team/KGroupCard.vue

@@ -25,7 +25,7 @@
 <script>
 import _ from 'lodash'
 import mixins from '../../mixins'
-import { findMembersOfGroup, getRoleForGroup, Roles, RoleNames } from '../../../common/permissions'
+import { findMembersOfGroup, getRoleForGroup, getRoleForOrganisation, Roles, RoleNames } from '../../../common/permissions'
 import { KCard, KCardSection } from '../collection'
 import { KTextArea } from '../frame'
 
@@ -47,14 +47,21 @@ export default {
   computed: {
     header () {
       const components = _.filter(this.itemActions, { scope: 'header' })
-      components.splice(0, 0, { component: 'QBadge', label: this.$t(this.memberRoleLabel), color: 'grey-7' }, { component: 'QSpace' })
+      if (this.memberRoleLabel) {
+        components.splice(0, 0, { component: 'QBadge', label: this.$t(this.memberRoleLabel), color: 'grey-7' }, { component: 'QSpace' })
+      } else {
+        components.splice(0, 0, { component: 'QSpace' })
+      }
       return components
     },
     memberRoleLabel () {
       const user = this.$store.get('user')
-      const role = getRoleForGroup(user, this.contextId, this.item._id)
-      if (!_.isUndefined(role)) return this.roleLabels[Roles[role]]
-      else return ''
+      // Organisation managers can manage all groups so that we do not display anything about role
+      let role = getRoleForOrganisation(user, this.contextId)
+      if (Roles[role] >= Roles.manager) return ''
+      // Otherwise the user can be member or manager of the group
+      role = getRoleForGroup(user, this.contextId, this.item._id)
+      return (!_.isUndefined(role) ? this.roleLabels[Roles[role]] : '')
     },
     dense () {
       return this.$q.screen.lt.sm

package/lib/core/client/components/team/KGroupsActivity.vue

@@ -11,7 +11,7 @@
         :renderer="renderer"
         :base-query="sorter.query"
         :filter-query="filter.query"
-        :list-strategy="'smart'">
+        :list-strategy="'always'">
         <template slot="empty-section">
           <div class="absolute-center">
             <k-stamp icon="las la-exclamation-circle" icon-size="3rem" :text="$t('KGrid.EMPTY_GRID')" />

package/lib/core/client/components/team/KJoinGroup.vue

@@ -6,16 +6,16 @@
       :buttons="getButtons()"
       v-model="isModalOpened"
       @opened="$emit('opened')"
-      @closed="$emit('closed')">
-      <div slot="modal-content" class="column xs-gutter">
-        <k-form ref="form" :schema="schema" />
-      </div>
+      @closed="$emit('closed')"
+    >
+      <k-form ref="form" :schema="schema" />
     </k-modal>
   </div>
 </template>
 
 <script>
 import _ from 'lodash'
+import { Roles, getRoleForOrganisation } from '../../../common/permissions'
 import mixins from '../../mixins'
 
 export default {
@@ -42,7 +42,7 @@ export default {
     },
     schema () {
       if (this.member === null) return {}
-      return {
+      const schema = {
         $schema: 'http://json-schema.org/draft-06/schema#',
         $id: 'http://kalisio.xyz/schemas/join-group#',
         title: 'Join Group Form',
@@ -68,24 +68,21 @@ export default {
               component: 'form/KItemField',
               label: 'KJoinGroup.GROUP_FIELD_LABEL'
             }
-          },
-          role: {
-            type: 'string',
-            default: 'member',
-            field: {
-              component: 'form/KSelectField',
-              label: 'KJoinGroup.ROLE_FIELD_LABEL',
-              type: 'radio',
-              options: [
-                { label: this.$t('KAddMember.MEMBER_LABEL'), value: 'member' },
-                { label: this.$t('KAddMember.MANAGER_LABEL'), value: 'manager' },
-                { label: this.$t('KAddMember.OWNER_LABEL'), value: 'owner' }
-              ]
-            }
           }
         },
-        required: ['group', 'role']
+        required: ['group']
+      }
+      if (Roles[this.role] === Roles.member) {
+        _.set(schema, 'properties.role', {
+          type: 'string',
+          default: false,
+          field: {
+            component: 'form/KToggleField',
+            label: 'KJoinGroup.ROLE_FIELD_LABEL'
+          }
+        })
       }
+      return schema
     }
   },
   data () {
@@ -109,7 +106,7 @@ export default {
         const authorisationService = this.$api.getService('authorisations')
         await authorisationService.create({
           scope: 'groups',
-          permissions: result.values.role,
+          permissions: _.get(result.values.role, false) ? 'manager' : 'member',
           subjects: this.objectId,
           subjectsService: this.contextId + '/members',
           resource: result.values.group._id,
@@ -119,11 +116,14 @@ export default {
       }
     }
   },
-  async created () {
+  beforeCreate () {
     this.$options.components['k-modal'] = this.$load('frame/KModal')
     this.$options.components['k-form'] = this.$load('form/KForm')
+  },
+  async created () {
     // Load the member
     this.member = await this.loadObject()
+    this.role = getRoleForOrganisation(this.member, this.contextId)
   }
 }
 </script>

package/lib/core/client/components/team/KMemberCard.vue

@@ -222,17 +222,32 @@ export default {
     },
     canJoinGroup () {
       const user = this.$store.get('user')
-      // Can add members to a group if at least manager/owner of one
+      // Organisation managers can manage all groups
+      const role = getRoleForOrganisation(user, this.contextId)
+      if (Roles[role] >= Roles.manager) return true
+      // Group managers can manage members of their own groups so
+      // can add members to a group if at least manager of one
       const groups = findGroupsWithRole(user, this.contextId, Roles.manager)
-        .concat(findGroupsWithRole(user, this.contextId, Roles.owner))
       // FIXME: we should also filter by the member groups so that if already added to all my groups we don't show the action
       return groups.length > 0
     },
     canChangeRoleInGroup (group) {
-      return this.$can('create', 'authorisations', this.item._id, { resource: group._id })
+      const memberRole = getRoleForOrganisation(this.item, this.contextId)
+      if (Roles[memberRole] >= Roles.manager) return false
+      const user = this.$store.get('user')
+      // Organisation managers can manage all groups
+      const userRole = getRoleForOrganisation(user, this.contextId)
+      if (Roles[userRole] >= Roles.manager) return true
+      // Group managers can manage members of their own groups
+      else return this.$can('create', 'authorisations', null, { resource: group._id, permissions: 'member' })
     },
     canLeaveGroup (group) {
-      return this.$can('remove', 'authorisations', this.item._id, { resource: group._id })
+      const user = this.$store.get('user')
+      // Organisation managers can manage all groups
+      const role = getRoleForOrganisation(user, this.contextId)
+      if (Roles[role] >= Roles.manager) return true
+      // Group managers can manage members of their own groups
+      else return this.$can('remove', 'authorisations', null, { resource: group._id, permissions: 'member' })
     },
     onChangeRoleInGroup (group) {
       this.$router.push({

package/lib/core/client/components/viewer/KModalViewer.vue

@@ -5,18 +5,24 @@
     :buttons="getButtons()"
     v-model="isModalOpened"
     @opened="$emit('opened')"
-    @closed="$emit('closed')">
-    <div slot="modal-content">
-      <k-view :values="object" :schema="schema" />
-    </div>
+    @closed="$emit('closed')"
+  >
+    <k-view :values="object" :schema="schema" />
   </k-modal>
 </template>
 
 <script>
+import { KModal, KScrollArea } from '../frame'
+import { KView } from '../form'
 import mixins from '../../mixins'
 
 export default {
   name: 'k-modal-viewer',
+  components: {
+    KModal,
+    KScrollArea,
+    KView
+  },
   mixins: [
     mixins.baseViewer,
     mixins.baseModal,
@@ -34,11 +40,6 @@ export default {
       await this.refresh()
       this.isModalOpened = true
     }
-  },
-  created () {
-    // Loads the required components
-    this.$options.components['k-modal'] = this.$load('frame/KModal')
-    this.$options.components['k-view'] = this.$load('form/KView')
   }
 }
 </script>

package/lib/core/client/i18n/core_en.json

@@ -64,7 +64,44 @@
     "OAUTH2_PROVIDER": "You cannot update your account because it is managed by {{provider}}, in order to switch to a local account reset your password first",
     "EMAIL_ALREADY_TAKEN": "A user with this email address seems to be already registered",
     "OBJECT_ID_ALREADY_TAKEN": "An item with this identifier seems to already exist. Please try again with another value.",
-    "DUPLICATED_FILE": "The file {{file}} is already added"
+    "DUPLICATED_FILE": "The file {{file}} is already added",
+    "UNSUPPORTED_FILE_FORMAT": "The {{file}} file format is not supported",
+    "CANNOT_READ_FILE": "Unable to read the file {{file}}",
+    "INVALID_JSON_FILE": "{{file}} is not a valid JSON file",
+    "INVALID_CSV_FILE": "{{file}} is not a valid CSV file",
+    "NETWORK_ERROR": "Network error occured"
+  },
+  "units": {
+    "METER_SYMBOL": "m",
+    "MILE_SYMBOL": "mi",
+    "NAUTICAL_MILE_SYMBOL": "m",
+    "SQUARED_METER_SYMBOL": "m²",
+    "SQUARED_KILOMETER_SYMBOL": "km²",
+    "ACRE_SYMBOL": "a",
+    "HECTARE_SYMBOL": "ha",
+    "METER_PER_SECOND_SYMBOL": "m/s",
+    "KILOMETER_PER_HOUR_SYMBOL": "km/h",
+    "KNOT_SYMBOL": "kt",
+    "CELSIUS_SYMBOL": "°C",
+    "FAHRENHEIT_SYMBOL": "°F",
+    "KELVIN_SYMBOL": "K",
+    "DEGREE_SYMBOL": "°",
+    "RADIAN_SYMBOL": "rad",
+    "METER_LABEL": "Meters",
+    "MILE_LABEL": "Miles",
+    "NAUTICAL_MILE_LABEL": "Nautical miles",
+    "SQUARED_METER_LABEL": "Squared meters",
+    "SQUARED_KILOMETER_LABEL": "Squared kilometers",
+    "ACRE_LABEL": "Acres",
+    "HECTARE_LABEL": "Hectares",
+    "METER_PER_SECOND_LABEL": "Meters per second",
+    "KILOMETER_PER_HOUR_LABEL": "Kilometers per hour",
+    "KNOT_LABEL": "Knots",
+    "CELSIUS_LABEL": "Celcius degrees",
+    "FAHRENHEIT_LABEL": "Fahrenhiet degrees",
+    "KELVIN_LABEL": "Kelvins",
+    "DEGREE_LABEL": "Degrees",
+    "RADIAN_LABEL": "Radians"
   },
   "mixins": {
     "baseItem": {
@@ -89,7 +126,29 @@
     "TAGS_DESCRIPTION_FIELD_LABEL": "Enter a description of this tag",
     "GROUPS_CREATE_TITLE": "Create a new group ?",
     "GROUPS_NAME_FIELD_LABEL": "Enter the name of this group",
-    "GROUPS_DESCRIPTION_FIELD_LABEL": "Enter a description for this group"
+    "GROUPS_DESCRIPTION_FIELD_LABEL": "Enter a description for this group",
+    "UPDATE_SETTINGS_TITLE": "Your settings",
+    "TIME_FORMAT_SETTINGS": "Time/Date format",
+    "TIME_FORMAT_SHORT_TIME_FIELD_LABEL": "Short time format",
+    "TIME_FORMAT_SHORT_TIME_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_LONG_TIME_FIELD_LABEL": "Long time format",
+    "TIME_FORMAT_LONG_TIME_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_SHORT_DATE_FIELD_LABEL": "Short date format",
+    "TIME_FORMAT_SHORT_DATE_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_LONG_DATE_FIELD_LABEL": "Long date format",
+    "TIME_FORMAT_LONG_DATE_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_SHORT_YEAR_FIELD_LABEL": "Short year format",
+    "TIME_FORMAT_SHORT_YEAR_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_LONG_YEAR_FIELD_LABEL": "Long year format",
+    "TIME_FORMAT_LONG_YEAR_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_UTC_FIELD_LABEL": "UTC time display mode",
+    "UNITS_SETTINGS": "Units settings",
+    "LENGTH_FIELD_LABEL": "Default length unit",
+    "AREA_FIELD_LABEL": "Default area unit",
+    "VELOCITY_FIELD_LABEL": "Default velocity unit",
+    "TEMPERATURE_FIELD_LABEL": "Default temperature unit",
+    "ANGLE_FIELD_LABEL": "Default angle unit",
+    "PRECISION_FIELD_LABEL": "Default number of decimal digits"
   },
   "tours": {
     "APP_BAR_OVERFLOW_MENU_LABEL": "When not visible, you can find it using the popup menu.",
@@ -223,6 +282,12 @@
       "MULTIPLE_FILE_LABEL": "Upload the CSV file listing the persons to be invited. Each person is represented by a row containing the fields <b>name</b>, <b>email</b> and <b>role</b> separated using a <b>,</b> separator.",
       "MULTIPLE_ADD_BUTTON_LABEL": "Click this button to proceed with the invitations."
     },
+    "join-group": {
+      "GROUP_NAME_LABEL": "Typing <b>the first characters</b> of a group name to make it selectable.",
+      "MEMBER_ROLE_LABEL": "Choisissez le rôle de la personne au sein du groupe.",
+      "ROLES_LABEL": "Un <b>membre</b> a un accès consultatif au groupe alors qu'un <b>gestionnaire</b> a le pouvoir de gérer les membres du groupe (ajout/suppression).",
+      "ADD_MEMBER_LABEL": "Confirm adding the member to the group."
+    },
     "tag-member": {
       "TAG_NAME_LABEL": "Typing <b>the first characters</b> of a tag name to make it selectable if it already exists or add it otherwise using the Return key.",
       "TAG_REMOVE_LABEL": "Once added remove it using the cross.",
@@ -243,7 +308,10 @@
       "UPDATE_TAG_DESCRIPTION_LABEL": "Update the description of your tag through this action."
     }
   },
-  "KWelcome": {
+  "reader": {
+    "READING_FILE": "Please wait while Reading {{file}}"
+  },
+  "KWelcome": { 
     "WELCOME_TITLE": "Welcome !",
     "WELCOME_MESSAGE": "This quick start guide covers the main application features.",
     "ONLINE_HELP": "Read first our online help to get an overview of the basic concepts",
@@ -474,7 +542,6 @@
     "ERROR_WHILE_LOADING_THE_FILE": "Error while loading the file, did you select a valid file ?",
     "INVALID_FILE_TYPE": "Invalid file type, please select the right file type",
     "INVALID_JSON_FILE": "Invalid JSON file",
-    "INVALID_GEOJSON_FILE": "Invalid GeoJSON file",
     "INVALID_CSV_FILE": "Invalid CSV file"
   },
   "KMediaBrowser": {
@@ -551,7 +618,7 @@
   "KJoinGroup": {
     "TITLE": "Add {{member}} to an existing group ?",
     "GROUP_FIELD_LABEL": "Enter the name of the group",
-    "ROLE_FIELD_LABEL": "Select the role granted to the user",
+    "ROLE_FIELD_LABEL": "Delegate group management to this member?",
     "OWNER_LABEL": "$t(OWNER)",
     "MANAGER_LABEL": "$t(MANAGER)",
     "MEMBER_LABEL": "$t(MEMBER)",
@@ -561,9 +628,6 @@
   "KChangeRole": {
     "TITLE": "Change role of {{member}} ?",
     "ROLE_FIELD_LABEL": "Select the role to be granted to the user",
-    "OWNER_LABEL": "$t(OWNER)",
-    "MANAGER_LABEL": "$t(MANAGER)",
-    "MEMBER_LABEL": "$t(MEMBER)",
     "CLOSE_ACTION": "$t(CLOSE)",
     "UPDATE_BUTTON": "Update"
   },

package/lib/core/client/i18n/core_fr.json

@@ -64,7 +64,44 @@
     "OAUTH2_PROVIDER": "Vous ne pouvez modifier votre compte car il est géré par {{provider}}, pour utiliser un compte local réinitialisez tout d'abord votre mot de passe",
     "OBJECT_ID_ALREADY_TAKEN": "Un élément semble déjà enregistré avec cet identifiant. Merci de réessayer avec une autre valeur.",
     "EMAIL_ALREADY_TAKEN": "Un utilisateur semble déjà enregistré avec cette adresse mail",
-    "DUPLICATED_FILE": "Le fichier {{file}} a déjà été ajouté"
+    "DUPLICATED_FILE": "Le fichier {{file}} a déjà été ajouté",
+    "UNSUPPORTED_FILE_FORMAT": "Le format du fichier {{file}} n'est pas supporté",
+    "CANNOT_READ_FILE": "Impossible de lire le fichier {{file}}",
+    "INVALID_JSON_FILE": "{{file}} n'est pas un fichier JSON valide",
+    "INVALID_CSV_FILE": "{{file}} n'est pas un fichier CSV valide",
+    "NETWORK_ERROR": "Une erreur réseau s'est produite"
+  },
+  "units": {
+    "METER_SYMBOL": "m",
+    "MILE_SYMBOL": "mi",
+    "NAUTICAL_MILE_SYMBOL": "nm",
+    "SQUARED_METER_SYMBOL": "m²",
+    "SQUARED_KILOMETER_SYMBOL": "km²",
+    "ACRE_SYMBOL": "a",
+    "HECTARE_SYMBOL": "ha",
+    "METER_PER_SECOND_SYMBOL": "m/s",
+    "KILOMETER_PER_HOUR_SYMBOL": "km/h",
+    "KNOT_SYMBOL": "kt",
+    "CELSIUS_SYMBOL": "°C",
+    "FAHRENHEIT_SYMBOL": "°F",
+    "KELVIN_SYMBOL": "K",
+    "DEGREE_SYMBOL": "°",
+    "RADIAN_SYMBOL": "rad",
+    "METER_LABEL": "Mètres",
+    "MILE_LABEL": "Milles",
+    "NAUTICAL_MILE_LABEL": "Milles nautique",
+    "SQUARED_METER_LABEL": "Mètres carrés",
+    "SQUARED_KILOMETER_LABEL": "Kilomètres carrés",
+    "ACRE_LABEL": "Acres",
+    "HECTARE_LABEL": "Hectares",
+    "METER_PER_SECOND_LABEL": "Mètres par seconde",
+    "KILOMETER_PER_HOUR_LABEL": "Kilomètres par heure",
+    "KNOT_LABEL": "Noeuds",
+    "CELSIUS_LABEL": "Degrés celcius",
+    "FAHRENHEIT_LABEL": "Degrés Fahrenheit",
+    "KELVIN_LABEL": "Kelvins",
+    "DEGREE_LABEL": "Degrés",
+    "RADIAN_LABEL": "Radians"
   },
   "mixins": {
     "baseItem": {
@@ -89,7 +126,29 @@
     "TAGS_DESCRIPTION_FIELD_LABEL": "Saisissez une description de l'étiquette",
     "GROUPS_CREATE_TITLE": "Créer un nouveau groupe ?",
     "GROUPS_NAME_FIELD_LABEL": "Saisissez le nom du groupe",
-    "GROUPS_DESCRIPTION_FIELD_LABEL": "Saisissez une description du groupe"
+    "GROUPS_DESCRIPTION_FIELD_LABEL": "Saisissez une description du groupe",
+    "UPDATE_SETTINGS_TITLE": "Vos paramètres",
+    "TIME_FORMAT_SETTINGS": "Format de date et d'heure",
+    "TIME_FORMAT_SHORT_TIME_FIELD_LABEL": "Format d'heure abrégé",
+    "TIME_FORMAT_SHORT_TIME_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_LONG_TIME_FIELD_LABEL": "Format d'heure complet",
+    "TIME_FORMAT_LONG_TIME_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_SHORT_DATE_FIELD_LABEL": "Format de jour abrégé",
+    "TIME_FORMAT_SHORT_DATE_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_LONG_DATE_FIELD_LABEL": "Format de jour complet",
+    "TIME_FORMAT_LONG_DATE_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_SHORT_YEAR_FIELD_LABEL": "Format d'année abrégé",
+    "TIME_FORMAT_SHORT_YEAR_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_LONG_YEAR_FIELD_LABEL": "Format d'année complet",
+    "TIME_FORMAT_LONG_YEAR_FIELD_HELPER": "<a target='_blank' href='https://momentjs.com/docs/#/displaying/format/'>&#x1F6C8;</a>",
+    "TIME_FORMAT_UTC_FIELD_LABEL": "Mode d'affichage temporel UTC",
+    "UNITS_SETTINGS": "Paramétrage des unités",
+    "LENGTH_FIELD_LABEL": "Unité de longueur par défaut",
+    "AREA_FIELD_LABEL": "Unité d'aire par défaut",
+    "VELOCITY_FIELD_LABEL": "Unité de vitesse par défaut",
+    "TEMPERATURE_FIELD_LABEL": "Unité de température par défaut",
+    "ANGLE_FIELD_LABEL": "Unité d'angle par défaut",
+    "PRECISION_FIELD_LABEL": "Nombre de chiffre décimaux par défaut"
   },
   "tours": {
     "APP_BAR_OVERFLOW_MENU_LABEL": "Lorsqu'il n'est pas visible, vous pourrez le retrouver dans ce menu déroulant.",
@@ -226,7 +285,7 @@
     "join-group": {
       "GROUP_NAME_LABEL": "Tapez <b>les premières lettres</b> du nom d'un groupe pour le sélectionner.",
       "MEMBER_ROLE_LABEL": "Choisissez le rôle de la personne au sein du groupe.",
-      "ROLES_LABEL": "Un <b>membre</b> a un accès consultatif au groupe alors qu'un <b>gestionnaire</b> a un pouvoir d'édition et un <b>propriétaire</b> a un contrôle total (destruction).",
+      "ROLES_LABEL": "Un <b>membre</b> a un accès consultatif au groupe alors qu'un <b>gestionnaire</b> a le pouvoir de gérer les membres du groupe (ajout/suppression).",
       "ADD_MEMBER_LABEL": "Confirmez l'ajout du membre au groupe."
     },
     "tag-member": {
@@ -249,6 +308,9 @@
       "UPDATE_TAG_DESCRIPTION_LABEL": "Modifiez la description de votre étiquette via cette action."
     }
   },
+  "reader": {
+    "READING_FILE": "Lecture de {{file}} en cours.<br>Veuillez patienter."
+  },
   "KWelcome": {
     "WELCOME_TITLE": "Bienvenue !",
     "WELCOME_MESSAGE": "Cette prise en main rapide va vous permettre de balayer les principales fonctionnalités de l'application.",
@@ -480,7 +542,6 @@
     "ERROR_WHILE_LOADING_THE_FILE": "Erreur durant la lecture du fichier, avez-vous sélectionné un fichier valide ?",
     "INVALID_FILE_TYPE": "Type de fichier invalide, veuillez sélectionner un fichier du bon type.",
     "INVALID_JSON_FILE": "Fichier JSON invalide",
-    "INVALID_GEOJSON_FILE": "Fichier GeoJSON invalide",
     "INVALID_CSV_FILE": "Fichier CSV invalide"
   },
   "KMediaBrowser": {
@@ -558,7 +619,7 @@
   "KJoinGroup": {
     "TITLE": "Ajouter {{member}} à un groupe existant ?",
     "GROUP_FIELD_LABEL": "Saisissez le nom du groupe",
-    "ROLE_FIELD_LABEL": "Sélectionnez le rôle à attribuer",
+    "ROLE_FIELD_LABEL": "Déléguer la gestion du groupe à ce membre ?",
     "OWNER_LABEL": "$t(OWNER)",
     "MANAGER_LABEL": "$t(MANAGER)",
     "MEMBER_LABEL": "$t(MEMBER)",
@@ -568,9 +629,6 @@
   "KChangeRole": {
     "TITLE": "Changer le rôle de {{member}} ?",
     "ROLE_FIELD_LABEL": "Sélectionnez le rôle à attribuer",
-    "OWNER_LABEL": "$t(OWNER)",
-    "MANAGER_LABEL": "$t(MANAGER)",
-    "MEMBER_LABEL": "$t(MEMBER)",
     "CLOSE_ACTION": "$t(CLOSE_ACTION)",
     "UPDATE_BUTTON": "Mettre à jour"
   },