artalk 2.4.1 → 2.4.2

package/dist/i18n/jp.js

@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).jp=n()}(this,(function(){"use strict";var e,n,o;return e="jp",n={placeholder:"コメントを残す",noComment:"コメントなし",send:"送信",save:"保存",nick:"ニックネーム",email:"メール",link:"ウェブサイト",emoticon:"絵文字",preview:"プレビュー",image:"画像",uploadFail:"アップロードに失敗しました",commentFail:"コメントに失敗しました",restoredMsg:"コンテンツが復元されました",onlyAdminCanReply:"管理者のみが返信できます",uploadLoginMsg:"アップロードするには、名前とメールアドレスを入力してください",counter:"{count} コメント",sortLatest:"最新のもの",sortOldest:"最も古い",sortBest:"ベスト",sortAuthor:"著者",openComment:"コメントを開く",closeComment:"コメントを閉じる",listLoadFailMsg:"コメントの読み込みに失敗しました",listRetry:"クリックで再試行",loadMore:"もっと読み込む",admin:"管理者",reply:"返信",voteUp:"アップ",voteDown:"ダウン",voteFail:"投票に失敗しました",readMore:"続きを読む",actionConfirm:"確認",collapse:"折りたたむ",collapsed:"折りたたまれた",collapsedMsg:"このコメントは折りたたまれました",expand:"展開",approved:"承認されました",pending:"保留中",pendingMsg:"保留中、コメント投稿者にのみ表示されます",edit:"編集",editCancel:"編集をキャンセル",delete:"削除",deleteConfirm:"確認",pin:"ピン",unpin:"ピン外し",seconds:"秒前",minutes:"分前",hours:"時間前",days:"数日前",now:"たった今",adminCheck:"管理者パスワードを入力してください:",captchaCheck:"続けるにはCAPTCHAを入力してください:",confirm:"確認",cancel:"取消",msgCenter:"メッセージ",ctrlCenter:"コンソール",frontend:"フロントエンド",backend:"バックエンド",loading:"読み込み中",loadFail:"読み込みに失敗しました",editing:"編集中",editFail:"編集に失敗しました",deleting:"削除中",deleteFail:"削除に失敗しました",reqGot:"リクエストを取得しました",reqAborted:"リクエストがタイムアウトしたか、予期せず終了した"},o=["jp-JP"],window.ArtalkI18n||(window.ArtalkI18n={}),window.ArtalkI18n[e]=n,o&&o.forEach((e=>{window.ArtalkI18n[e]=n})),n}));

package/dist/i18n/zh-TW.js

@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self)["zh-TW"]=n()}(this,(function(){"use strict";var e,n,o;return e="zh-TW",n={placeholder:"鍵入內容...",noComment:"「此時無聲勝有聲」",send:"發送評論",save:"保存評論",nick:"昵稱",email:"郵箱",link:"網址",emoticon:"表情",preview:"預覽",image:"圖片",uploadFail:"上傳失敗",commentFail:"評論失敗",restoredMsg:"內容已自動恢復",onlyAdminCanReply:"僅管理員可評論",uploadLoginMsg:"填入你的名字郵箱才能上傳哦",counter:"{count} 條評論",sortLatest:"最新",sortOldest:"最早",sortBest:"最熱",sortAuthor:"作者",openComment:"打開評論",closeComment:"關閉評論",listLoadFailMsg:"無法獲取評論列表數據",listRetry:"點擊重新獲取",loadMore:"加載更多",admin:"管理員",reply:"回覆",voteUp:"贊同",voteDown:"反對",voteFail:"投票失敗",readMore:"閱讀更多",actionConfirm:"確認操作",collapse:"摺疊",collapsed:"已摺疊",collapsedMsg:"該評論已被系統或管理員摺疊",expand:"展開",approved:"已審",pending:"待審",pendingMsg:"審核中，僅本人可見。",edit:"編輯",editCancel:"取消編輯",delete:"刪除",deleteConfirm:"確認刪除",pin:"置頂",unpin:"取消置頂",seconds:"秒前",minutes:"分鐘前",hours:"小時前",days:"天前",now:"剛剛",adminCheck:"鍵入密碼來驗證管理員身份：",captchaCheck:"鍵入驗證碼繼續：",confirm:"確認",cancel:"取消",msgCenter:"通知中心",ctrlCenter:"控制中心",frontend:"前端",backend:"後端",loading:"加載中",loadFail:"加載失敗",editing:"修改中",editFail:"修改失敗",deleting:"刪除中",deleteFail:"刪除失敗",reqGot:"請求響應",reqAborted:"請求超時或意外終止"},window.ArtalkI18n||(window.ArtalkI18n={}),window.ArtalkI18n[e]=n,o&&o.forEach((e=>{window.ArtalkI18n[e]=n})),n}));

package/dist/src/i18n/index.d.ts

@@ -206,79 +206,73 @@ export declare const internal: {
         reqAborted: string;
     };
 };
-export declare const external: {
-    'jp-JP': {};
-    'zh-TW': {
-        placeholder: string;
-        noComment: string;
-        send: string;
-        save: string;
-        nick: string;
-        email: string;
-        link: string;
-        emoticon: string;
-        preview: string;
-        image: string;
-        uploadFail: string;
-        commentFail: string;
-        restoredMsg: string;
-        onlyAdminCanReply: string;
-        uploadLoginMsg: string;
-        counter: string;
-        sortLatest: string;
-        sortOldest: string;
-        sortBest: string;
-        sortAuthor: string;
-        openComment: string;
-        closeComment: string;
-        listLoadFailMsg: string;
-        listRetry: string;
-        loadMore: string;
-        admin: string;
-        reply: string;
-        voteUp: string;
-        voteDown: string;
-        voteFail: string;
-        readMore: string;
-        actionConfirm: string;
-        collapse: string;
-        collapsed: string;
-        collapsedMsg: string;
-        expand: string;
-        approved: string;
-        pending: string;
-        pendingMsg: string;
-        edit: string;
-        editCancel: string;
-        delete: string;
-        deleteConfirm: string;
-        pin: string;
-        unpin: string;
-        seconds: string;
-        minutes: string;
-        hours: string;
-        days: string;
-        now: string;
-        adminCheck: string;
-        captchaCheck: string;
-        confirm: string;
-        cancel: string;
-        msgCenter: string;
-        ctrlCenter: string;
-        frontend: string;
-        backend: string;
-        loading: string;
-        loadFail: string;
-        editing: string;
-        editFail: string;
-        deleting: string;
-        deleteFail: string;
-        reqGot: string;
-        reqAborted: string;
-    };
-    'fr-FR': {};
-    'de-DE': {};
-    'bn-IN': {};
+export declare function defineLocaleExternal(lang: string, locale: I18n, aliases?: string[]): {
+    placeholder: string;
+    noComment: string;
+    send: string;
+    save: string;
+    nick: string;
+    email: string;
+    link: string;
+    emoticon: string;
+    preview: string;
+    image: string;
+    uploadFail: string;
+    commentFail: string;
+    restoredMsg: string;
+    onlyAdminCanReply: string;
+    uploadLoginMsg: string;
+    counter: string;
+    sortLatest: string;
+    sortOldest: string;
+    sortBest: string;
+    sortAuthor: string;
+    openComment: string;
+    closeComment: string;
+    listLoadFailMsg: string;
+    listRetry: string;
+    loadMore: string;
+    admin: string;
+    reply: string;
+    voteUp: string;
+    voteDown: string;
+    voteFail: string;
+    readMore: string;
+    actionConfirm: string;
+    collapse: string;
+    collapsed: string;
+    collapsedMsg: string;
+    expand: string;
+    approved: string;
+    pending: string;
+    pendingMsg: string;
+    edit: string;
+    editCancel: string;
+    delete: string;
+    deleteConfirm: string;
+    pin: string;
+    unpin: string;
+    seconds: string;
+    minutes: string;
+    hours: string;
+    days: string;
+    now: string;
+    adminCheck: string;
+    captchaCheck: string;
+    confirm: string;
+    cancel: string;
+    msgCenter: string;
+    ctrlCenter: string;
+    frontend: string;
+    backend: string;
+    loading: string;
+    loadFail: string;
+    editing: string;
+    editFail: string;
+    deleting: string;
+    deleteFail: string;
+    reqGot: string;
+    reqAborted: string;
 };
 /**
  * get a locale object by language name
@@ -290,5 +284,5 @@ declare function getLocaleSet(lang: string): I18n;
 declare function getI18n(locale: I18n | string, key: keyof I18n, args?: {
     [key: string]: string;
 }): string;
-export { getLocaleSet, getI18n };
+export { getLocaleSet };
 export default getI18n;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artalk",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "backendMinVersion": "2.2.0",
   "license": "LGPL-3.0",
   "description": "A Selfhosted Comment System",
@@ -34,8 +34,9 @@
   },
   "scripts": {
     "dev": "vite",
-    "build": "pnpm lint && vite build && pnpm build:lite",
+    "build": "pnpm lint && vite build && pnpm build:lite && pnpm build:i18n",
     "build:lite": "vite build --config vite-lite.config.ts",
+    "build:i18n": "node scripts/build-i18n.mjs",
     "build:demo": "vite build --config vite-demo.config.ts",
     "serve": "vite preview",
     "deploy": "gh-pages -d deploy",

package/scripts/build-i18n.mjs

@@ -0,0 +1,46 @@
+import fs from 'fs'
+import path from 'path'
+import { build } from 'vite'
+import { fileURLToPath } from 'url'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const i18nPath = path.join(__dirname, '../src/i18n/')
+const outDir = path.resolve(__dirname, '../dist/i18n')
+
+// empty outDir before build
+fs.rmSync(outDir, { recursive: true, force: true })
+
+const libraries = []
+
+fs.readdirSync(i18nPath).forEach(f => {
+  if (['index.ts'].includes(f)) return
+
+  const filename = path.join(i18nPath, f)
+  const lang = path.parse(filename).name
+  const content = fs.readFileSync(filename);
+
+  // only compile the external locale
+  if (!content.toString().includes('defineLocaleExternal')) return
+
+  libraries.push({
+    entry: filename,
+    name: lang,
+    fileName: (format) => ((format == "umd") ? `${lang}.js` : `${lang}.${format}.js`),
+  })
+})
+
+libraries.forEach(async (lib) => {
+  await build({
+    build: {
+      target: 'es2015',
+      outDir: outDir,
+      minify: 'terser',
+      emptyOutDir: false,
+      lib: {
+        ...lib,
+        formats: ['umd'],
+      },
+    },
+    configFile: false, // prevent load any vite config file
+  })
+})

package/src/i18n/index.ts

@@ -12,92 +12,13 @@ export const internal = {
   'zh-CN': zhCN,
 }
 
-export const external = {
-  'jp-JP': {},
-  'zh-TW': {
-    /* Editor */
-    placeholder: '鍵入內容...',
-    noComment: '「此時無聲勝有聲」',
-    send: '發送評論',
-    save: '保存評論',
-    nick: '昵稱',
-    email: '郵箱',
-    link: '網址',
-    emoticon: '表情',
-    preview: '預覽',
-    image: '圖片',
-    uploadFail: '上傳失敗',
-    commentFail: '評論失敗',
-    restoredMsg: '內容已自動恢復',
-    onlyAdminCanReply: '僅管理員可評論',
-    uploadLoginMsg: '填入你的名字郵箱才能上傳哦',
+const GLOBAL_LOCALES_KEY = "ArtalkI18n";
 
-    /* List */
-    counter: '{count} 條評論',
-    sortLatest: '最新',
-    sortOldest: '最早',
-    sortBest: '最熱',
-    sortAuthor: '作者',
-    openComment: '打開評論',
-    closeComment: '關閉評論',
-    listLoadFailMsg: '無法獲取評論列表數據',
-    listRetry: '點擊重新獲取',
-    loadMore: '加載更多',
-
-    /* Comment */
-    admin: '管理員',
-    reply: '回覆',
-    voteUp: '贊同',
-    voteDown: '反對',
-    voteFail: '投票失敗',
-    readMore: '閱讀更多',
-    actionConfirm: '確認操作',
-    collapse: '摺疊',
-    collapsed: '已摺疊',
-    collapsedMsg: '該評論已被系統或管理員摺疊',
-    expand: '展開',
-    approved: '已審',
-    pending: '待審',
-    pendingMsg: '審核中，僅本人可見。',
-    edit: '編輯',
-    editCancel: '取消編輯',
-    delete: '刪除',
-    deleteConfirm: '確認刪除',
-    pin: '置頂',
-    unpin: '取消置頂',
-
-    /* Time */
-    seconds: '秒前',
-    minutes: '分鐘前',
-    hours: '小時前',
-    days: '天前',
-    now: '剛剛',
-
-    /* Checker */
-    adminCheck: '鍵入密碼來驗證管理員身份：',
-    captchaCheck: '鍵入驗證碼繼續：',
-    confirm: '確認',
-    cancel: '取消',
-
-    /* Sidebar */
-    msgCenter: '通知中心',
-    ctrlCenter: '控制中心',
-
-    /* General */
-    frontend: '前端',
-    backend: '後端',
-    loading: '加載中',
-    loadFail: '加載失敗',
-    editing: '修改中',
-    editFail: '修改失敗',
-    deleting: '刪除中',
-    deleteFail: '刪除失敗',
-    reqGot: '請求響應',
-    reqAborted: '請求超時或意外終止',
-  },
-  'fr-FR': {},
-  'de-DE': {},
-  'bn-IN': {},
+export function defineLocaleExternal(lang: string, locale: I18n, aliases?: string[]) {
+  if (!window[GLOBAL_LOCALES_KEY]) window[GLOBAL_LOCALES_KEY] = {}
+  window[GLOBAL_LOCALES_KEY][lang] = locale
+  if (aliases) aliases.forEach(l => { window[GLOBAL_LOCALES_KEY][l] = locale })
+  return locale
 }
 
 /**
@@ -110,12 +31,19 @@ function getLocaleSet(lang: string): I18n {
     (_, p1: string, p2: string) => (p1.toLowerCase() + (p2 || '').toUpperCase())
   )
 
-  // case not found
-  if (!internal[lang]) {
-    return internal.en // use `en` by default
+  // internal finding
+  if (internal[lang]) {
+    return internal[lang]
+  }
+
+  // external finding
+  if (window[GLOBAL_LOCALES_KEY] && window[GLOBAL_LOCALES_KEY][lang]) {
+    return window[GLOBAL_LOCALES_KEY][lang]
   }
 
-  return internal[lang]
+  // case when not found:
+  // use `en` by default
+  return internal.en
 }
 
 /**
@@ -132,5 +60,5 @@ function getI18n(locale: I18n|string, key: keyof I18n, args: {[key: string]: str
   return str
 }
 
-export { getLocaleSet, getI18n }
+export { getLocaleSet }
 export default getI18n

package/src/i18n/jp.ts

@@ -0,0 +1,83 @@
+import { defineLocaleExternal } from '.'
+
+export default defineLocaleExternal('jp', {
+  /* エディタ */
+  placeholder: 'コメントを残す',
+  noComment: 'コメントなし',
+  send: '送信',
+  save: '保存',
+  nick: 'ニックネーム',
+  email: 'メール',
+  link: 'ウェブサイト',
+  emoticon: '絵文字',
+  preview: 'プレビュー',
+  image: '画像',
+  uploadFail: 'アップロードに失敗しました',
+  commentFail: 'コメントに失敗しました',
+  restoredMsg: 'コンテンツが復元されました',
+  onlyAdminCanReply: '管理者のみが返信できます',
+  uploadLoginMsg: 'アップロードするには、名前とメールアドレスを入力してください',
+
+  /* リスト */
+  counter: '{count} コメント',
+  sortLatest: '最新のもの',
+  sortOldest: '最も古い',
+  sortBest: 'ベスト',
+  sortAuthor: '著者',
+  openComment: 'コメントを開く',
+  closeComment: 'コメントを閉じる',
+  listLoadFailMsg: 'コメントの読み込みに失敗しました',
+  listRetry: 'クリックで再試行',
+  loadMore: 'もっと読み込む',
+
+  /* コメント */
+  admin: '管理者',
+  reply: '返信',
+  voteUp: 'アップ',
+  voteDown: 'ダウン',
+  voteFail: '投票に失敗しました',
+  readMore: '続きを読む',
+  actionConfirm: '確認',
+  collapse: '折りたたむ',
+  collapsed: '折りたたまれた',
+  collapsedMsg: 'このコメントは折りたたまれました',
+  expand: '展開',
+  approved: '承認されました',
+  pending: '保留中',
+  pendingMsg: '保留中、コメント投稿者にのみ表示されます',
+  edit: '編集',
+  editCancel: '編集をキャンセル',
+  delete: '削除',
+  deleteConfirm: '確認',
+  pin: 'ピン',
+  unpin: 'ピン外し',
+
+  /* 時間 */
+  seconds: '秒前',
+  minutes: '分前',
+  hours: '時間前',
+  days: '数日前',
+  now: 'たった今',
+
+  /* チェッカー */
+  adminCheck: '管理者パスワードを入力してください:',
+  captchaCheck: '続けるにはCAPTCHAを入力してください:',
+  confirm: '確認',
+  cancel: '取消',
+
+  /* サイドバー */
+  msgCenter: 'メッセージ',
+  ctrlCenter: 'コンソール',
+
+  /* 一般 */
+  frontend: 'フロントエンド',
+  backend: 'バックエンド',
+  loading: '読み込み中',
+  loadFail: '読み込みに失敗しました',
+  editing: '編集中',
+  editFail: '編集に失敗しました',
+  deleting: '削除中',
+  deleteFail: '削除に失敗しました',
+  reqGot: 'リクエストを取得しました',
+  reqAborted: 'リクエストがタイムアウトしたか、予期せず終了した',
+}, ['jp-JP'])

package/src/i18n/zh-TW.ts

@@ -0,0 +1,83 @@
+import { defineLocaleExternal } from '.'
+
+export default defineLocaleExternal('zh-TW', {
+  /* Editor */
+  placeholder: '鍵入內容...',
+  noComment: '「此時無聲勝有聲」',
+  send: '發送評論',
+  save: '保存評論',
+  nick: '昵稱',
+  email: '郵箱',
+  link: '網址',
+  emoticon: '表情',
+  preview: '預覽',
+  image: '圖片',
+  uploadFail: '上傳失敗',
+  commentFail: '評論失敗',
+  restoredMsg: '內容已自動恢復',
+  onlyAdminCanReply: '僅管理員可評論',
+  uploadLoginMsg: '填入你的名字郵箱才能上傳哦',
+
+  /* List */
+  counter: '{count} 條評論',
+  sortLatest: '最新',
+  sortOldest: '最早',
+  sortBest: '最熱',
+  sortAuthor: '作者',
+  openComment: '打開評論',
+  closeComment: '關閉評論',
+  listLoadFailMsg: '無法獲取評論列表數據',
+  listRetry: '點擊重新獲取',
+  loadMore: '加載更多',
+
+  /* Comment */
+  admin: '管理員',
+  reply: '回覆',
+  voteUp: '贊同',
+  voteDown: '反對',
+  voteFail: '投票失敗',
+  readMore: '閱讀更多',
+  actionConfirm: '確認操作',
+  collapse: '摺疊',
+  collapsed: '已摺疊',
+  collapsedMsg: '該評論已被系統或管理員摺疊',
+  expand: '展開',
+  approved: '已審',
+  pending: '待審',
+  pendingMsg: '審核中，僅本人可見。',
+  edit: '編輯',
+  editCancel: '取消編輯',
+  delete: '刪除',
+  deleteConfirm: '確認刪除',
+  pin: '置頂',
+  unpin: '取消置頂',
+
+  /* Time */
+  seconds: '秒前',
+  minutes: '分鐘前',
+  hours: '小時前',
+  days: '天前',
+  now: '剛剛',
+
+  /* Checker */
+  adminCheck: '鍵入密碼來驗證管理員身份：',
+  captchaCheck: '鍵入驗證碼繼續：',
+  confirm: '確認',
+  cancel: '取消',
+
+  /* Sidebar */
+  msgCenter: '通知中心',
+  ctrlCenter: '控制中心',
+
+  /* General */
+  frontend: '前端',
+  backend: '後端',
+  loading: '加載中',
+  loadFail: '加載失敗',
+  editing: '修改中',
+  editFail: '修改失敗',
+  deleting: '刪除中',
+  deleteFail: '刪除失敗',
+  reqGot: '請求響應',
+  reqAborted: '請求超時或意外終止',
+})

package/src/style/main.less

@@ -103,6 +103,23 @@
   tr:nth-child(even) {
     background-color: var(--at-color-bg-grey);
   }
+
+  ul {
+    list-style: disc;
+  }
+
+  ol {
+    list-style: decimal;
+  }
+
+  li + li {
+    margin-top: 8px;
+  }
+
+  li > ol,
+  li > ul {
+    margin: 8px 0 0;
+  }
 }
 
 .atk-hide {

package/test/ArtalkI18n.html

@@ -1,5 +1,6 @@
 <link rel="stylesheet" href="../dist/Artalk.css">
 <script src="../dist/Artalk.js"></script>
+<script src="../dist/i18n/zh-TW.js"></script>
 
 <div id="comments"></div>