feat: default locale with namespacing
This commit is contained in:
		| @@ -145,7 +145,7 @@ | ||||
|             v-list.py-0 | ||||
|               template(v-for='(lc, idx) of locales') | ||||
|                 v-list-tile(@click='changeLocale(lc)') | ||||
|                   v-list-tile-action: v-chip(:color='lc.code === $i18n.i18next.language ? `blue` : `grey`', small, label, dark) {{lc.code.toUpperCase()}} | ||||
|                   v-list-tile-action: v-chip(:color='lc.code === locale ? `blue` : `grey`', small, label, dark) {{lc.code.toUpperCase()}} | ||||
|                   v-list-tile-title {{lc.name}} | ||||
|                 v-divider.my-0(v-if='idx < locales.length - 1') | ||||
|           v-tooltip(bottom, v-if='isAuthenticated && isAdmin') | ||||
| @@ -231,6 +231,7 @@ export default { | ||||
|     isLoading: get('isLoading'), | ||||
|     title: get('site/title'), | ||||
|     path: get('page/path'), | ||||
|     locale: get('page/locale'), | ||||
|     mode: get('page/mode'), | ||||
|     name: get('user/name'), | ||||
|     email: get('user/email'), | ||||
| @@ -293,19 +294,19 @@ export default { | ||||
|       this.newPageModal = true | ||||
|     }, | ||||
|     pageNewCreate ({ path, locale }) { | ||||
|       window.location.assign(`/e/${path}`) | ||||
|       window.location.assign(`/e/${locale}/${path}`) | ||||
|     }, | ||||
|     pageView () { | ||||
|       window.location.assign(`/${this.path}`) | ||||
|       window.location.assign(`/${this.locale}/${this.path}`) | ||||
|     }, | ||||
|     pageEdit () { | ||||
|       window.location.assign(`/e/${this.path}`) | ||||
|       window.location.assign(`/e/${this.locale}/${this.path}`) | ||||
|     }, | ||||
|     pageHistory () { | ||||
|       window.location.assign(`/h/${this.path}`) | ||||
|       window.location.assign(`/h/${this.locale}/${this.path}`) | ||||
|     }, | ||||
|     pageSource () { | ||||
|       window.location.assign(`/s/${this.path}`) | ||||
|       window.location.assign(`/s/${this.locale}/${this.path}`) | ||||
|     }, | ||||
|     pageMove () { | ||||
|       this.$store.commit('showNotification', { | ||||
|   | ||||
| @@ -12,44 +12,44 @@ | ||||
|           :width='2' | ||||
|           v-show='searchLoading' | ||||
|           ) | ||||
|       .d-flex(style='min-height:400px;') | ||||
|         v-flex(xs4).grey(:class='darkMode ? `darken-4` : `lighten-3`') | ||||
|           v-toolbar(color='grey darken-3', dark, dense, flat) | ||||
|             .body-2 Folders | ||||
|             v-spacer | ||||
|             v-btn(icon): v-icon create_new_folder | ||||
|           v-treeview( | ||||
|             v-model='tree' | ||||
|             :items='treeFolders' | ||||
|             :load-children='fetchFolders' | ||||
|             activatable | ||||
|             open-on-click | ||||
|             hoverable | ||||
|             ) | ||||
|             template(slot='prepend', slot-scope='{ item, open, leaf }') | ||||
|               v-icon {{ open ? 'folder_open' : 'folder' }} | ||||
|         v-flex(xs8) | ||||
|           v-toolbar(color='grey darken-2', dark, dense, flat) | ||||
|             .body-2 Pages | ||||
|             v-spacer | ||||
|             v-btn(icon): v-icon forward | ||||
|             v-btn(icon): v-icon delete | ||||
|           v-list(dense) | ||||
|             v-list-tile | ||||
|               v-list-tile-avatar: v-icon insert_drive_file | ||||
|               v-list-tile-title File A | ||||
|             v-divider | ||||
|             v-list-tile | ||||
|               v-list-tile-avatar: v-icon insert_drive_file | ||||
|               v-list-tile-title File B | ||||
|             v-divider | ||||
|             v-list-tile | ||||
|               v-list-tile-avatar: v-icon insert_drive_file | ||||
|               v-list-tile-title File C | ||||
|             v-divider | ||||
|             v-list-tile | ||||
|               v-list-tile-avatar: v-icon insert_drive_file | ||||
|               v-list-tile-title File D | ||||
|       //- .d-flex(style='min-height:400px;') | ||||
|       //-   v-flex(xs4).grey(:class='darkMode ? `darken-4` : `lighten-3`') | ||||
|       //-     v-toolbar(color='grey darken-3', dark, dense, flat) | ||||
|       //-       .body-2 Folders | ||||
|       //-       v-spacer | ||||
|       //-       v-btn(icon): v-icon create_new_folder | ||||
|       //-     v-treeview( | ||||
|       //-       v-model='tree' | ||||
|       //-       :items='treeFolders' | ||||
|       //-       :load-children='fetchFolders' | ||||
|       //-       activatable | ||||
|       //-       open-on-click | ||||
|       //-       hoverable | ||||
|       //-       ) | ||||
|       //-       template(slot='prepend', slot-scope='{ item, open, leaf }') | ||||
|       //-         v-icon {{ open ? 'folder_open' : 'folder' }} | ||||
|       //-   v-flex(xs8) | ||||
|       //-     v-toolbar(color='grey darken-2', dark, dense, flat) | ||||
|       //-       .body-2 Pages | ||||
|       //-       v-spacer | ||||
|       //-       v-btn(icon): v-icon forward | ||||
|       //-       v-btn(icon): v-icon delete | ||||
|       //-     v-list(dense) | ||||
|       //-       v-list-tile | ||||
|       //-         v-list-tile-avatar: v-icon insert_drive_file | ||||
|       //-         v-list-tile-title File A | ||||
|       //-       v-divider | ||||
|       //-       v-list-tile | ||||
|       //-         v-list-tile-avatar: v-icon insert_drive_file | ||||
|       //-         v-list-tile-title File B | ||||
|       //-       v-divider | ||||
|       //-       v-list-tile | ||||
|       //-         v-list-tile-avatar: v-icon insert_drive_file | ||||
|       //-         v-list-tile-title File C | ||||
|       //-       v-divider | ||||
|       //-       v-list-tile | ||||
|       //-         v-list-tile-avatar: v-icon insert_drive_file | ||||
|       //-         v-list-tile-title File D | ||||
|       v-card-actions.grey.pa-2(:class='darkMode ? `darken-3-d5` : `lighten-1`') | ||||
|         v-select( | ||||
|           solo | ||||
| @@ -80,6 +80,8 @@ | ||||
| <script> | ||||
| import { get } from 'vuex-pathify' | ||||
|  | ||||
| /* global siteLangs, siteConfig */ | ||||
|  | ||||
| export default { | ||||
|   props: { | ||||
|     value: { | ||||
| @@ -110,7 +112,7 @@ export default { | ||||
|       currentPath: 'new-page', | ||||
|       tree: [], | ||||
|       treeChildren: [], | ||||
|       namespaces: ['en'] | ||||
|       namespaces: siteLangs.length ? siteLangs.map(ns => ns.code) : [siteConfig.lang] | ||||
|     } | ||||
|   }, | ||||
|   computed: { | ||||
|   | ||||
| @@ -185,6 +185,8 @@ | ||||
| import _ from 'lodash' | ||||
| import { sync, get } from 'vuex-pathify' | ||||
|  | ||||
| /* global siteLangs, siteConfig */ | ||||
|  | ||||
| export default { | ||||
|   props: { | ||||
|     value: { | ||||
| @@ -197,7 +199,7 @@ export default { | ||||
|       isPublishStartShown: false, | ||||
|       isPublishEndShown: false, | ||||
|       pageSelectorShown: false, | ||||
|       namespaces: ['en'], | ||||
|       namespaces: siteLangs.length ? siteLangs.map(ns => ns.code) : [siteConfig.lang], | ||||
|       tourSteps: [ | ||||
|         { | ||||
|           target: '.dialog-header', | ||||
|   | ||||
| @@ -66,7 +66,7 @@ | ||||
|               .caption.grey--text.text--darken-1 {{ updatedAt | moment('calendar') }} | ||||
|             v-spacer | ||||
|             v-tooltip(left) | ||||
|               v-btn.btn-animate-edit(icon, slot='activator', :href='"/e/" + path') | ||||
|               v-btn.btn-animate-edit(icon, slot='activator', :href='"/e/" + locale + "/" + path') | ||||
|                 v-icon(color='grey') edit | ||||
|               span {{$t('common:page.editPage')}} | ||||
|           v-divider | ||||
|   | ||||
		Reference in New Issue
	
	Block a user