修改一堆文案

2024-12-26 21:00:15 +08:00 · 2019-07-15 21:30:52 +08:00 · 2019-07-15 21:30:52 +08:00 · ac1bda0392
commit ac1bda0392
parent 5cdb786966
11 changed files with 43 additions and 32 deletions
--- a/README.md
+++ b/README.md
@ -21,8 +21,8 @@
   ```bat
   blivechat.exe --host 127.0.0.1 --port 12450
   ```
-3. 用浏览器打开[http://localhost:12450](http://localhost:12450)，输入房间ID，保存配置，进入房间，复制房间URL
-4. （可选）用样式生成器生成样式，复制CSS
+3. 用浏览器打开[http://localhost:12450](http://localhost:12450)，输入房间ID，保存配置，复制房间URL
+4. 用样式生成器生成样式，复制CSS
 5. 在OBS中添加浏览器源，输入URL和自定义CSS，或者可以在首页的样式设置里输入CSS

 ### 源代码版
@ -41,8 +41,8 @@
   ```sh
   python3 main.py --host 127.0.0.1 --port 12450
   ```
-3. 用浏览器打开[http://localhost:12450](http://localhost:12450)，输入房间ID，保存配置，进入房间，复制房间URL
-4. （可选）用样式生成器生成样式，复制CSS
+3. 用浏览器打开[http://localhost:12450](http://localhost:12450)，输入房间ID，保存配置，复制房间URL
+4. 用样式生成器生成样式，复制CSS
 5. 在OBS中添加浏览器源，输入URL和自定义CSS，或者可以在首页的样式设置里输入CSS

 ### Docker
--- a/frontend/src/api/config.js
+++ b/frontend/src/api/config.js
@ -1,7 +1,6 @@
 import axios from 'axios'

 import {mergeConfig} from '@/utils'
-import stylegen from '@/views/StyleGenerator/stylegen'

 export const DEFAULT_CONFIG = {
  minGiftPrice: 6.911, // $1
@ -18,7 +17,7 @@ export const DEFAULT_CONFIG = {
  blockUsers: '',
  blockMedalLevel: 0,

-  css: stylegen.getStyle(stylegen.DEFAULT_CONFIG)
+  css: ''
 }

 export function setLocalConfig (config) {
--- a/frontend/src/components/ChatRenderer/PaidMessage.vue
+++ b/frontend/src/components/ChatRenderer/PaidMessage.vue
@ -16,7 +16,7 @@
        <div id="header-content" class="style-scope yt-live-chat-paid-message-renderer">
          <div id="header-content-primary-column" class="style-scope yt-live-chat-paid-message-renderer">
            <div id="author-name" class="style-scope yt-live-chat-paid-message-renderer">{{authorName}}</div>
-            <div id="purchase-amount" class="style-scope yt-live-chat-paid-message-renderer">CN¥{{price}}</div>
+            <div id="purchase-amount" class="style-scope yt-live-chat-paid-message-renderer">{{priceText}}</div>
          </div>
          <span id="timestamp" class="style-scope yt-live-chat-paid-message-renderer">{{time}}</span>
        </div>
@ -33,6 +33,7 @@
 <script>
 import ImgShadow from './ImgShadow.vue'
 import * as constants from './constants'
+import {formatCurrency} from '@/utils'

 export default {
  name: 'PaidMessage',
@ -49,6 +50,9 @@ export default {
  computed: {
    color() {
      return constants.getPriceConfig(this.price).colors
+    },
+    priceText() {
+      return 'CN¥' + formatCurrency(this.price)
    }
  }
 }
--- a/frontend/src/components/ChatRenderer/Ticker.vue
+++ b/frontend/src/components/ChatRenderer/Ticker.vue
@ -45,6 +45,7 @@ import ImgShadow from './ImgShadow.vue'
 import LegacyPaidMessage from './LegacyPaidMessage.vue'
 import PaidMessage from './PaidMessage.vue'
 import * as constants from './constants'
+import {formatCurrency} from '@/utils'

 export default {
  name: 'Ticker',
@ -106,9 +107,9 @@ export default {
    },
    getText(message) {
      if (message.type === constants.MESSAGE_TYPE_MEMBER) {
-        return '会员'
+        return 'Member'
      }
-      return `CN¥${message.price}`
+      return 'CN¥' + formatCurrency(message.price)
    },
    updateProgress() {
      let curTime = new Date()
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@ -17,14 +17,14 @@ export default {
    maxSpeed: 'Max speed of messages (/second, 0 for unlimited)',

    block: 'Block',
-    giftDanmaku: 'System messages (gift effect)',
-    blockLevel: 'User level lower than',
-    informalUser: 'Informal users',
-    unverifiedUser: 'Unverified users',
+    giftDanmaku: 'Block system messages (gift effect)',
+    blockLevel: 'Block user level lower than',
+    informalUser: 'Block informal users',
+    unverifiedUser: 'Block unverified users',
    blockKeywords: 'Block keywords',
    onePerLine: 'One per line',
    blockUsers: 'Block users',
-    blockMedalLevel: 'Medal level lower than',
+    blockMedalLevel: 'Block medal level lower than',

    style: 'Style',

--- a/frontend/src/lang/ja.js
+++ b/frontend/src/lang/ja.js
@ -17,14 +17,14 @@
    maxSpeed: 'コメントの最大速度（バー/秒、0は無制限）',

    block: 'ブロック',
-    giftDanmaku: 'システムコメント（プレゼント効果）',
-    blockLevel: 'ユーザーレベルがx未満',
-    informalUser: '非公式ユーザー',
-    unverifiedUser: '認証されていないユーザー',
-    blockKeywords: 'キーワード',
+    giftDanmaku: 'ブロックシステムコメント（プレゼント効果）',
+    blockLevel: 'ブロックユーザーレベルがx未満',
+    informalUser: 'ブロック非公式ユーザー',
+    unverifiedUser: 'ブロック認証されていないユーザー',
+    blockKeywords: 'ブロックキーワード',
    onePerLine: '1行に1つずつ',
-    blockUsers: 'ユーザー',
-    blockMedalLevel: '勲章等級がx未満',
+    blockUsers: 'ブロックユーザー',
+    blockMedalLevel: 'ブロック勲章等級がx未満',

    style: 'スタイル',

--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@ -17,14 +17,14 @@ export default {
    maxSpeed: '弹幕最大速度（条/秒，0为无限制）',

    block: '屏蔽',
-    giftDanmaku: '礼物弹幕',
-    blockLevel: '用户等级低于',
-    informalUser: '非正式会员',
-    unverifiedUser: '未绑定手机用户',
+    giftDanmaku: '屏蔽礼物弹幕',
+    blockLevel: '屏蔽用户等级低于',
+    informalUser: '屏蔽非正式会员',
+    unverifiedUser: '屏蔽未绑定手机用户',
    blockKeywords: '屏蔽关键词',
    onePerLine: '一行一个',
    blockUsers: '屏蔽用户',
-    blockMedalLevel: '当前直播间勋章等级低于',
+    blockMedalLevel: '屏蔽当前直播间勋章等级低于',

    style: '样式',

--- a/frontend/src/utils.js
+++ b/frontend/src/utils.js
@ -6,6 +6,13 @@ export function mergeConfig (config, defaultConfig) {
  return res
 }

-export default {
-  mergeConfig
+export function formatCurrency (price) {
+  return new Intl.NumberFormat('zh-CN', {
+    minimumFractionDigits: price < 100 ? 2 : 0
+  }).format(price)
+}
+
+export default {
+  mergeConfig,
+  formatCurrency
 }
--- a/frontend/src/views/Room.vue
+++ b/frontend/src/views/Room.vue
@ -123,7 +123,7 @@ export default {
          time: `${time.getMinutes()}:${time.getSeconds()}`,
          authorName: data.authorName,
          title: 'NEW MEMBER!',
-          content: `Welcome ${data.authorName}`
+          content: `Welcome ${data.authorName}!`
        }
        break
      }
--- a/frontend/src/views/StyleGenerator/index.vue
+++ b/frontend/src/views/StyleGenerator/index.vue
@ -264,7 +264,7 @@ const EXAMPLE_MESSAGES = [
    ...legacyPaidMessageTemplate,
    id: nextId++,
    authorName: 'Paryi',
-    content: 'Welcome Paryi'
+    content: 'Welcome Paryi!'
  }, {
    ...paidMessageTemplate,
    id: nextId++,
--- a/frontend/src/views/StyleGenerator/stylegen.js
+++ b/frontend/src/views/StyleGenerator/stylegen.js
@ -382,11 +382,11 @@ function getAnimationStyle (config) {
      : ` transform: translateX(${config.reverseSlide ? 16 : -16}px);`
    } }`)
    curTime += config.fadeInTime
-    keyframes.push(`  ${(curTime / totalTime) * 100}% { opacity: 1; transform: none;}`)
+    keyframes.push(`  ${(curTime / totalTime) * 100}% { opacity: 1; transform: none; }`)
  }
  if (config.animateOut) {
    curTime += config.animateOutWaitTime * 1000
-    keyframes.push(`  ${(curTime / totalTime) * 100}% { opacity: 1; transform: none;}`)
+    keyframes.push(`  ${(curTime / totalTime) * 100}% { opacity: 1; transform: none; }`)
    curTime += config.fadeOutTime
    keyframes.push(`  ${(curTime / totalTime) * 100}% { opacity: 0;${!config.slide ? ''
      : ` transform: translateX(${config.reverseSlide ? -16 : 16}px);`