From ebd4a9a36d6f58a1aa35db3712280b87f88757a0 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Wed, 9 May 2018 12:23:28 +0800 Subject: [PATCH] cfg(torrents): change tags of resources --- config/env/torrents.js | 36 ++++++--------- modules/core/client/app/trans-string-en.js | 48 +++++++++----------- modules/core/client/app/trans-string-zh.js | 52 ++++++++++------------ 3 files changed, 58 insertions(+), 78 deletions(-) diff --git a/config/env/torrents.js b/config/env/torrents.js index a61fa471..32fb5d6f 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -1371,7 +1371,8 @@ module.exports = { {name: 'BLU_RAY', icon: ''}, {name: 'REMUX', icon: ''}, {name: 'WEB_DL', icon: ''}, - {name: 'ENCODE', icon: ''} + {name: 'ENCODE', icon: ''}, + {name: 'HDTV', icon: ''} ] }, { @@ -1388,21 +1389,23 @@ module.exports = { name: 'VIDEO', cats: ['movie', 'tvserial', 'documentary', 'music', 'sports', 'variety', 'adult'], value: [ - {name: 'AVC', icon: ''}, - {name: 'X265', icon: ''}, - {name: 'X264', icon: ''} + {name: 'H264', icon: ''}, + {name: 'H265', icon: ''}, + {name: 'X264', icon: ''}, + {name: 'X265', icon: ''} ] }, { name: 'AUDIO', cats: ['movie', 'tvserial', 'documentary', 'music', 'sports', 'variety', 'adult'], value: [ - {name: 'AAC', icon: ''}, - {name: 'AC3', icon: ''}, - {name: 'LPCM', icon: ''}, - {name: 'DTS', icon: ''}, + {name: 'DTS_X', icon: ''}, + {name: 'ATMOS', icon: ''}, {name: 'DTS_HD', icon: ''}, - {name: 'ATMOS_TRUEHD', icon: ''} + {name: 'TRUE_HD', icon: ''}, + {name: 'DTS', icon: ''}, + {name: 'AC3', icon: ''}, + {name: 'AAC', icon: ''} ] }, { @@ -1414,22 +1417,11 @@ module.exports = { {name: 'APE', icon: ''} ] }, - { - name: 'CHANNEL', - cats: ['movie', 'tvserial', 'documentary', 'music', 'sports', 'variety', 'adult'], - value: [ - {name: 'C20', icon: ''}, - {name: 'C51', icon: ''}, - {name: 'C71', icon: ''} - ] - }, { name: 'THREED', cats: ['movie', 'documentary', 'adult'], value: [ - {name: 'T3D', icon: ''}, - {name: 'T2D', icon: ''}, - {name: 'T2D_3D', icon: ''} + {name: 'T3D', icon: ''} ] }, { @@ -1449,7 +1441,7 @@ module.exports = { name: 'REGION', cats: ['movie', 'tvserial', 'documentary', 'music', 'sports', 'variety', 'adult'], value: [ - {name: 'USA', icon: ''}, + {name: 'EUR_USA', icon: ''}, {name: 'CHINA', icon: ''}, {name: 'JAPAN', icon: ''}, {name: 'KOREA', icon: ''}, diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 291958e9..5ad4bf48 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -1436,11 +1436,12 @@ /////////////////////////resources tag fields/////////////////////////////////// RESOURCESTAGS: { TYPE: { - SELF: 'Video Type', - BLU_RAY: 'BLU_RAY', - WEB_DL: 'WEB_DL', - REMUX: 'REMUX', - ENCODE: 'ENCODE' + SELF: 'Medium', + BLU_RAY: 'Blu-ray', + WEB_DL: 'Web', + REMUX: 'Remux', + ENCODE: 'Encode', + HDTV: 'HDTV' }, RESOLUTION: { @@ -1453,19 +1454,21 @@ VIDEO: { SELF: 'Video Codec', - AVC: 'AVC', - X265: 'X265', - X264: 'X264' + H264: 'H.264/AVC', + H265: 'H.265/HEVC', + X264: 'x264', + X265: 'x265' }, AUDIO: { SELF: 'Audio Codec', - AAC: 'AAC', - AC3: 'AC3', - LPCM: 'LPCM', + DTS_X: 'DTS:X', + ATMOS: 'Atmos', + DTS_HD: 'DTS-HD', + TRUE_HD: 'TRUE-HD', DTS: 'DTS', - DTS_HD: 'DTS HD', - ATMOS_TRUEHD: 'Atmos TrueHD' + AC3: 'AC3', + AAC: 'AAC' }, AUDIOFORMATS: { @@ -1475,30 +1478,21 @@ APE: 'APE' }, - CHANNEL: { - SELF: 'Audio Channel', - C20: '2.0 chnnel', - C51: '5.1 channel', - C71: '7.1 channel' - }, - THREED: { - SELF: '2D/3D', - T2D: '2D', - T3D: '3D', - T2D_3D: '2D-3D' + SELF: 'Three-D', + T3D: '3D' }, RANKING: { SELF: 'Ranking', - IMDB_TOP100: 'IMDB TOP100', - IMDB_TOP250: 'IMDB TOP250' + IMDB_TOP100: 'IMDB T100', + IMDB_TOP250: 'IMDB T250' }, REGION: { SELF: 'Region', CHINA: 'China', - USA: 'USA', + EUR_USA: 'EUR & USA', JAPAN: 'Japan', KOREA: 'Korea', INDIA: 'India', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index e5311d0f..746cc6a7 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -336,7 +336,7 @@ TAGS_SEARCH_GLOBAL: '种子搜索 - 全局', CA_KEYWORD: '关键字', CA_TORRENT_STATUS: '种子状态', - CA_TORRENT_HNR: 'Hit and Run', + CA_TORRENT_HNR: 'H&R 黑种', CA_TORRENT_SALE_STATUS: '促销状态', CA_TORRENT_SALE_NOW: '正在促销', CA_TORRENT_VIP: 'VIP 资源', @@ -1436,15 +1436,16 @@ /////////////////////////resources tag fields/////////////////////////////////// RESOURCESTAGS: { TYPE: { - SELF: '类型', - BLU_RAY: 'BLU_RAY', - WEB_DL: 'WEB_DL', - REMUX: 'REMUX', - ENCODE: 'ENCODE' + SELF: '媒介', + BLU_RAY: 'Blu-ray', + WEB_DL: 'Web', + REMUX: 'Remux', + ENCODE: 'Encode', + HDTV: 'HDTV' }, RESOLUTION: { - SELF: '解析度', + SELF: '分辨率', S4K: '4K', S1080P: '1080p', S1080I: '1080i', @@ -1453,19 +1454,21 @@ VIDEO: { SELF: '视频编码', - AVC: 'AVC', - X265: 'X265', - X264: 'X264' + H264: 'H.264/AVC', + H265: 'H.265/HEVC', + X264: 'x264', + X265: 'x265' }, AUDIO: { SELF: '音频编码', - AAC: 'AAC', - AC3: 'AC3', - LPCM: 'LPCM', + DTS_X: 'DTS:X', + ATMOS: 'Atmos', + DTS_HD: 'DTS-HD', + TRUE_HD: 'TRUE-HD', DTS: 'DTS', - DTS_HD: 'DTS HD', - ATMOS_TRUEHD: 'Atmos TrueHD' + AC3: 'AC3', + AAC: 'AAC' }, AUDIOFORMATS: { @@ -1475,30 +1478,21 @@ APE: 'APE' }, - CHANNEL: { - SELF: '声道', - C20: '2.0 声道', - C51: '5.1 声道', - C71: '7.1 声道' - }, - THREED: { - SELF: '2D/3D', - T2D: '2D', - T3D: '3D', - T2D_3D: '2D-3D' + SELF: '三维立体', + T3D: '3D' }, RANKING: { SELF: '排行榜', - IMDB_TOP100: 'IMDB TOP100', - IMDB_TOP250: 'IMDB TOP250' + IMDB_TOP100: 'IMDB T100', + IMDB_TOP250: 'IMDB T250' }, REGION: { SELF: '地区', CHINA: '中国', - USA: '美国', + EUR_USA: '欧美', JAPAN: '日本', KOREA: '韩国', INDIA: '印度',