Merge remote-tracking branch 'upstream/develop' into shigusegubu

* upstream/develop:
  i think it's due to my shitty js-to-json regex
  src/i18n/fr.json: More accurate translation
  update Japanese translation
  update french translation
  add support for disabling rich text formatting
  small thing to display instance-provided default
  console.log cleanup
  More languages
  added usage
  a tool to check what's missing from a language
  all other languages which do not have MRs related to them separated

src/components/settings/settings.js

@@ -25,6 +25,7 @@ const settings = {
       collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
         ? instance.collapseMessageWithSubject
         : user.collapseMessageWithSubject,
+      collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject),
       stopGifs: user.stopGifs,
       loopSilentAvailable:
         // Firefox

src/components/settings/settings.vue

@@ -29,7 +29,9 @@
           <ul class="setting-list">
             <li>
               <input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal">
-              <label for="collapseMessageWithSubject">{{$t('settings.collapse_subject')}}</label>
+              <label for="collapseMessageWithSubject">
+                {{$t('settings.collapse_subject')}} {{$t('settings.instance_default', { value: collapseMessageWithSubjectDefault })}}
+              </label>
             </li>
             <li>
               <input type="checkbox" id="streaming" v-model="streamingLocal">

src/components/user_settings/user_settings.js

@@ -7,6 +7,7 @@ const UserSettings = {
       newname: this.$store.state.users.currentUser.name,
       newbio: this.$store.state.users.currentUser.description,
       newlocked: this.$store.state.users.currentUser.locked,
+      newnorichtext: this.$store.state.users.currentUser.no_rich_text,
       newdefaultScope: this.$store.state.users.currentUser.default_scope,
       followList: null,
       followImportError: false,
@@ -53,7 +54,8 @@ const UserSettings = {
       const locked = this.newlocked
       /* eslint-disable camelcase */
       const default_scope = this.newdefaultScope
-      this.$store.state.api.backendInteractor.updateProfile({params: {name, description, locked, default_scope}}).then((user) => {
+      const no_rich_text = this.newnorichtext
+      this.$store.state.api.backendInteractor.updateProfile({params: {name, description, locked, default_scope, no_rich_text}}).then((user) => {
         if (!user.error) {
           this.$store.commit('addNewUsers', [user])
           this.$store.commit('setCurrentUser', user)

src/components/user_settings/user_settings.vue

@@ -25,6 +25,10 @@
                 <i v-on:click="changeVis('public')" class="icon-globe" :class="vis.public"></i>
               </div>
             </div>
+            <p>
+              <input type="checkbox" v-model="newnorichtext" id="account-no-rich-text">
+              <label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label>
+            </p>
             <button :disabled='newname.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
           </div>
           <div class="setting-item">