waibu-bootstrap 1.0.15 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-bootstrap",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Bootstrap suport for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/waibuMpa/theme/component/factory/form.js

@@ -19,7 +19,7 @@ async function form () {
       const group = groupAttrs(this.params.attr, ['grid'])
       this.params.attr = group._
       if (group.grid) this.params.html = await this.component.buildTag({ tag: 'gridRow', attr: group.grid, html: this.params.html })
-      if (this.params.attr.button === true) this.params.attr.button = 'reset:Reset-link submit:Submit-primary'
+      if (this.params.attr.button === true) this.params.attr.button = 'reset:reset-link submit:submit-primary'
       if (this.params.attr.button) {
         const rBtns = []
         const lBtns = []

package/waibuMpa/theme/component/factory/nav-dropdown-darkmode.js

@@ -13,8 +13,8 @@ async function navDropdownDarkmode () {
         content
       }
       const html = [
-        await this.component.buildTag({ tag: 'dropdownItem', attr: { href: this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'false') }), active: !this.component.req.darkMode }, html: this.component.req.t('Bright Mode') }),
-        await this.component.buildTag({ tag: 'dropdownItem', attr: { href: this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'true') }), active: this.component.req.darkMode }, html: this.component.req.t('Dark Mode') })
+        await this.component.buildTag({ tag: 'dropdownItem', attr: { href: this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'false') }), active: !this.component.req.darkMode }, html: this.component.req.t('brightMode') }),
+        await this.component.buildTag({ tag: 'dropdownItem', attr: { href: this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'true') }), active: this.component.req.darkMode }, html: this.component.req.t('darkMode') })
       ].join('\n')
       this.params.noTag = true
       this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html })

package/waibuMpa/theme/component/factory/nav-dropdown-language.js

@@ -2,7 +2,7 @@ async function navDropdownLanguage () {
   return class NavDropdownLanguage extends this.baseFactory {
     async build () {
       const { camelCase } = this.plugin.app.bajo.lib._
-      const { supportedLngs } = this.plugin.app.bajoI18N.config
+      const { supported } = this.plugin.app.bajo.config.intl
       const lang = this.component.req.lang
       const attr = {
         dropdown: true,
@@ -11,7 +11,7 @@ async function navDropdownLanguage () {
         content: lang.toUpperCase()
       }
       const html = []
-      for (const s of supportedLngs) {
+      for (const s of supported) {
         html.push(await this.component.buildTag({
           tag: 'dropdownItem',
           attr: { href: this.component.buildUrl({ params: { lang: s } }), active: lang === s },

package/waibuMpa/theme/component/factory/nav-dropdown-setting.js

@@ -2,7 +2,7 @@ async function navDropdownSetting () {
   return class NavDropdownSetting extends this.baseFactory {
     async build () {
       const { set, camelCase } = this.plugin.app.bajo.lib._
-      const { supportedLngs } = this.plugin.app.bajoI18N.config
+      const { supported } = this.plugin.app.bajo.config.intl
       const { groupAttrs } = this.plugin.app.waibuMpa
       const { generateId } = this.plugin.app.bajo
       const { routePath } = this.plugin.app.waibu
@@ -18,28 +18,28 @@ async function navDropdownSetting () {
         <c:dropdown-item href="${this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'false') })}" ${this.component.req.darkMode ? '' : 'active'} t:content="Bright" />
         <c:dropdown-item href="${this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'true') })}" ${!this.component.req.darkMode ? '' : 'active'} t:content="Dark" />
       `
-      if (supportedLngs.length > 0) {
+      if (supported.length > 0) {
         html += `
           <c:dropdown-item divider />
           <c:dropdown-item header t:content="Language" />
         `
-        for (const s of supportedLngs) {
+        for (const s of supported) {
           html += `<c:dropdown-item href="${this.component.buildUrl({ params: { lang: s } })}" ${this.component.req.lang === s ? 'active' : ''} t:content="${camelCase('lang ' + s)}" />`
         }
       }
       html += `
         <c:dropdown-item divider />
-        <c:dropdown-item t:content="Fullscreen"
+        <c:dropdown-item t:content="fullscreen"
           x-data="{
-            inText: '${this.component.req.t('Fullscreen')}',
-            outText: '${this.component.req.t('Exit Fullscreen')}',
+            inText: '${this.component.req.t('fullscreen')}',
+            outText: '${this.component.req.t('exitFullscreen')}',
             async toggle () {
               const el = document.querySelector('body')
               if (!document.fullscreenElement) {
                 try {
                   await el.requestFullscreen()
                 } catch (err) {
-                  await wbs.notify('Can\\'t go fullscreen, sorry!', { type: 'danger' })
+                  await wbs.notify('cantGoFullscreen', { type: 'danger' })
                 }
               } else {
                 document.exitFullscreen()
@@ -61,7 +61,7 @@ async function navDropdownSetting () {
       if (this.component.req.user) {
         const id = generateId('alpha')
         html += `
-          <c:dropdown-item t:content="Signout"
+          <c:dropdown-item t:content="signout"
             id="${id}"
             x-data="{
               async signout () {

package/waibuMpa/theme/component/factory/nav-dropdown-user.js

@@ -3,7 +3,7 @@ async function navDropdownUser () {
     async build () {
       const { routePath } = this.plugin.app.waibu
       const icon = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name: 'person' } }) : ''
-      let text = this.component.req.user ? `${this.component.req.user.firstName} ${this.component.req.user.lastName}` : this.component.req.t('Guest')
+      let text = this.component.req.user ? `${this.component.req.user.firstName} ${this.component.req.user.lastName}` : this.component.req.t('guest')
       if (this.params.attr.noText) text = ''
       const html = []
       const attr = {
@@ -18,15 +18,15 @@ async function navDropdownUser () {
         attr.href = routePath(this.component.req.user ? 'sumba:/my-stuff/profile' : 'sumba:/signin')
       } else {
         if (this.component.req.user) {
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/my-stuff/profile') }, html: this.component.req.t('Your Profile') }))
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/my-stuff/change-password') }, html: this.component.req.t('Change Password') }))
+          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/my-stuff/profile') }, html: this.component.req.t('yourProfile') }))
+          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/my-stuff/change-password') }, html: this.component.req.t('changePassword') }))
           html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { divider: true } }))
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/signout') }, html: this.component.req.t('Signout') }))
+          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/signout') }, html: this.component.req.t('signout') }))
         } else {
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/signin') }, html: this.component.req.t('Signin') }))
+          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/signin') }, html: this.component.req.t('signin') }))
           html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { divider: true } }))
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/user/signup') }, html: this.component.req.t('Signup') }))
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/user/forgot-password') }, html: this.component.req.t('Forgot Password') }))
+          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/user/signup') }, html: this.component.req.t('signup') }))
+          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/user/forgot-password') }, html: this.component.req.t('forgotPassword') }))
         }
       }
       this.params.noTag = true