From 3ee71db762b402e4b31794d76cf40a348463246b Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 25 May 2017 23:55:04 -0700 Subject: [PATCH 1/9] Added translation file --- templates/Translations/zh_CN.mo | Bin 0 -> 783 bytes templates/Translations/zh_CN.po | 37 ++++++++++++++++++++++++++++++++ templates/index.tpl | 13 +++++------ 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 templates/Translations/zh_CN.mo create mode 100644 templates/Translations/zh_CN.po diff --git a/templates/Translations/zh_CN.mo b/templates/Translations/zh_CN.mo new file mode 100644 index 0000000000000000000000000000000000000000..334876a0d05d0037a032bbb175a9495ac776d670 GIT binary patch literal 783 zcmYk3%}*0S6u?JCG}VLAcrnC0Z;-H+j|*w-L0d2+pbZv-Co=6m+Li52Gdl~`6A)1f z7$i|6hD2igAQ}RRiIhn7XyU=6M=y4_?Fs(`-?kWd$uGb8cpsC@@3T$M7{v*qg-8&m zh(*GWB5{V;A^h_n#1-NfagsQ9gfSqukS~xUQ8#tk!{70M7+JD^Gh+gMCYTBhJSi%FiQ28Inv zG^&&PGi*q58Dh5(ftx1SPA(^;LLDYCX&VY{7MJ2Krj*vNYqwF_)IJ1(_|1eCmB{^R zT8t~KpJ_ulVfY#Uj|RA{w1niAZE__fB@J*Z?eH{e3FO&B`w-mEj7Dz+2Kxtl59V|R zI|5N*DYU3fK1Wj&-cy%zCO51wq%vIEs3OCOKCR~<&mT92QtP!+LN}~*2zru+3XEvi z(L&jHM_iz8DCi1y1iJ!p(~;cN`h?8dA+U1wtsUtMLt`1~2nSgC%WQ4sN$u6A+Uw=L z-MMV8dvCYE$~*5W8(-b+x9;pVb63}^-&Sgm7Tq_G-MP=+%zEYJgX;T-Q~^}7|5Jaa zrVsxWR5l9K2`JV7UREwHR7)l1&CgS>a`A(=@Z6o-DwozMp)t){TiPpbvFhfwyEIdK ZG3!0u^cJV-+AB
@@ -15,20 +16,20 @@ {if $uglyUrls} {/if} -
+
{if $convert}

+ {t}Audio only (MP3){/t}

{/if}
- See all supported websites + {t}See all supported websites{/t}
-

Drag this to your bookmarks bar:

- Bookmarklet +

{t}Drag this to your bookmarks bar:{/t}

+ {t}Bookmarklet{/t}
From 124e6782dc0b397ed51cdb64f97f603745bdf3f1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 May 2017 00:00:47 -0700 Subject: [PATCH 2/9] Update composer.json to include smarty-gettext --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 94d0b81..6084112 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "ptachoire/process-builder-chain": "~1.2.0", "guzzlehttp/guzzle": "~6.2.0", "rudloff/rtmpdump-bin": "~2.3", - "aura/session": "~2.1.0" + "aura/session": "~2.1.0", + "smarty-gettext/smarty-gettext": "~1.2.0" }, "require-dev": { "symfony/var-dumper": "~3.2.0", From e9351d09e0116ce65e7789c138468aa33082c619 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 May 2017 03:58:48 -0700 Subject: [PATCH 3/9] Finish preparing pot file --- templates/Translations/template.pot | 124 ++++++++++++++++++++++++++++ templates/Translations/zh_CN.mo | Bin 783 -> 2222 bytes templates/Translations/zh_CN.po | 114 +++++++++++++++++++++++-- templates/error.tpl | 4 +- templates/extractors.tpl | 2 +- templates/inc/footer.tpl | 10 +-- templates/inc/header.tpl | 4 +- templates/password.tpl | 8 +- templates/playlist.tpl | 8 +- templates/video.tpl | 18 ++-- 10 files changed, 257 insertions(+), 35 deletions(-) create mode 100644 templates/Translations/template.pot diff --git a/templates/Translations/template.pot b/templates/Translations/template.pot new file mode 100644 index 0000000..e4178ba --- /dev/null +++ b/templates/Translations/template.pot @@ -0,0 +1,124 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8\n" + +#: ..\..\..\templates/error.tpl:5 +msgid "An error occured" +msgstr "" + +#: ..\..\..\templates/error.tpl:6 +msgid "Please check the URL of your video." +msgstr "" + +#: ..\..\..\templates/extractors.tpl:4 +msgid "Supported websites" +msgstr "" + +#: ..\..\..\templates/inc/footer.tpl:4 +msgid "Code by" +msgstr "" + +#: ..\..\..\templates/inc/footer.tpl:6 +msgid "Design by" +msgstr "" + +#: ..\..\..\templates/inc/footer.tpl:12 +msgid "AllTube Download on Facebook" +msgstr "" + +#: ..\..\..\templates/inc/footer.tpl:12 +msgid "Like us on Facebook" +msgstr "" + +#: ..\..\..\templates/inc/footer.tpl:14 +msgid "Get the code" +msgstr "" + +#: ..\..\..\templates/inc/footer.tpl:16 +msgid "Based on" +msgstr "" + +#: ..\..\..\templates/inc/header.tpl:4 +msgid "Share on Twitter" +msgstr "" + +#: ..\..\..\templates/inc/header.tpl:5 +msgid "Share on Facebook" +msgstr "" + +#: ..\..\..\templates/index.tpl:9 +msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)" +msgstr "" + +#: ..\..\..\templates/index.tpl:19 ..\..\..\templates/password.tpl:10 +#: ..\..\..\templates/playlist.tpl:23 ..\..\..\templates/video.tpl:85 +#: ..\..\..\templates/video.tpl:90 +msgid "Download" +msgstr "" + +#: ..\..\..\templates/index.tpl:24 +msgid "Audio only (MP3)" +msgstr "" + +#: ..\..\..\templates/index.tpl:29 +msgid "See all supported websites" +msgstr "" + +#: ..\..\..\templates/index.tpl:31 +msgid "Drag this to your bookmarks bar:" +msgstr "" + +#: ..\..\..\templates/index.tpl:32 +msgid "Bookmarklet" +msgstr "" + +#: ..\..\..\templates/password.tpl:5 +msgid "This video is protected" +msgstr "" + +#: ..\..\..\templates/password.tpl:6 +msgid "You need a password in order to download this video." +msgstr "" + +#: ..\..\..\templates/password.tpl:8 +msgid "Video password" +msgstr "" + +#: ..\..\..\templates/playlist.tpl:5 +msgid "Videos extracted from the" +msgstr "" + +#: ..\..\..\templates/playlist.tpl:7 +msgid "playlist:" +msgstr "" + +#: ..\..\..\templates/playlist.tpl:24 +msgid "More options" +msgstr "" + +#: ..\..\..\templates/video.tpl:6 +msgid "You are going to download" +msgstr "" + +#: ..\..\..\templates/video.tpl:24 +msgid "Available formats:" +msgstr "" + +#: ..\..\..\templates/video.tpl:31 +msgid "Generic formats" +msgstr "" + +#: ..\..\..\templates/video.tpl:34 +msgid "Best" +msgstr "" + +#: ..\..\..\templates/video.tpl:39 +msgid "Remux best video with best audio" +msgstr "" + +#: ..\..\..\templates/video.tpl:43 +msgid "Worst" +msgstr "" + +#: ..\..\..\templates/video.tpl:46 +msgid "Detailed formats" +msgstr "" diff --git a/templates/Translations/zh_CN.mo b/templates/Translations/zh_CN.mo index 334876a0d05d0037a032bbb175a9495ac776d670..3507120b32be0e93e8cedf03e35ce0437045fbd7 100644 GIT binary patch literal 2222 zcmZvc`*Raj6vwZE4+1_wL=@3GqbM*W@(>3CIF^PojIDNPc=?O7Np739o4s*&Lx~PE zDcbY_Z9yy0T7&|H4zJd!+R_KiIF3L1gFpF$qd$<{BtKRE1HUJ`Y3t}tZ$5kO-h0mX zoO5sgShnyhhUaCB7crJU#MnA;$;0@;GXm25x8T#@FCPB{m%;uEd>mY`fU$+(5^yoN z6nqR^4ekWjfQ!HgNPaYs_8kW~m<68#uY*g#G4L7iC(r&3d=a1; zPlEVk-*_AZN%t*}cfk)F)_#34B7owO{zZD?qd<~>{J3-28A4qZQK-%{KxE@S^wEjGZv`gP3cR2>ty8KXF(q4Y3KTlv#AE>u0F{l@$YZV6RC2c+o%8~LxdJIRb z)N4A2tU}Ymsfgeq*`#YyiE*j(DkUl+QZ}**oeRT|2A9!j$`CPDk&3AjOSCj!TT{Db z9jiF1sG1Vd1h1DyLb1#s+pU;_+_2rkwAgO=Nhn66CM;GdV}eK0U^30)!Vuhw3w~gK zHJ9}~EmHX!mYmdm31yLJ#2;S2PX{l1*z=ahJtYaZzstr212?-0I5z7nB$~mx* zp)|m^YH~}ujwv0IVe*J#1leAp3qy_0?%XS^l9nhGvTC(a@Ra$lO4LZGl}Qp}vRX|b zM;?ufXygB<5McX7B6W;MPy#QhCe@0&wn9Z@bwY4O)3}*RCZ%B^jV2K>RZEzxF0N3t zd5xHz3B!#g3|9BwU17@CEg)W!hO|T!ZrQ<7O_PdgHc7)XO)idEhC<(Yy&)5n1v?}S zGz_)p6uv>KI*KTH%sUySFS@`Eg_pf?Rp)RjjQI=Q%9oS`SW;8cnrd1>R%^(Qpvb>3 z=07M56O{~dU+w#0f2AQ5Dy%=GSfVuN-!G1;w4yv!t(cZSY$&>^DV8*Xye_VOtSS(A zB*k}HQcrK%zJ2S~t#56Ary+qu5s1pf+rDZnNGT1%9~Mdij>~qCe-i(&@;zV8zM4IA zS~dkX`YNSv2_2!*Nhq;Uq&JX&s_#Iv6~h$Pt^?sJ|F*exB&l8){yjR54hk0J+ajvv zJM1r=Fjs4>6fxD}n*$pIn|-xf%1|_a6>f_e{A*Ka-mtWx2c8^0)8VV}o|f7<^pGUut$P3>I2%FuQ-KaKE?M zddj}qX}A60oFF%a>sk2c2;g1M2bt#i7nJ93w<9jcQo7TuaOYm(&Vc8!FnldPnRS)0 z-1y1D^fYriIuIo{e#1F=)@~cgO<%%RSJcc@A1h}1px@h4=o+)T&$=Q>Ubz-_%cwIt z!cElcOE?jAG3*si2 z8}D*Wx1Qw3?mkgG-{SNPJExlA!D-Jp{q6bbGx?jn%x=r(CT>Fh+<(ovsq$@|-Rf;} z({|(8-RE-mFE|}nnP(4Y(Fo7TO_sW4kKJJ?kKH+Hk7V8IQH3y7?9UXgHQS{;Pf`Al?bYAn{W`Yy-sCfS3b_g&7$b z6o9l0kd^|{wm_NnURFkpt#434EKnfVI&c{!B|8omL>nhZ|)`PsRNMcFy2B@E8_ z1(gaJsYR)iKQfC=c43yET*s_AS&Kz_vNWsjtN>6sTzMMJX<^0Vr7fpP>rz5w( r`2C(vh9^6hJzu-;>Gq{hTenX>%H}p%m0gML*@FJ}J2p(d$gThYlYc@C diff --git a/templates/Translations/zh_CN.po b/templates/Translations/zh_CN.po index b86d3f4..11c17f7 100644 --- a/templates/Translations/zh_CN.po +++ b/templates/Translations/zh_CN.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" -"Last-Translator: \n" +"Last-Translator: Shiqiang Yu \n" "Language-Team: \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -12,26 +12,124 @@ msgstr "" "X-Generator: Poedit 2.0.2\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: E:\GitKraken\alltube\templates/index.tpl:9 +#: ..\..\..\templates/error.tpl:5 +msgid "An error occured" +msgstr "出错了" + +#: ..\..\..\templates/error.tpl:6 +msgid "Please check the URL of your video." +msgstr "请检查您的视频的 URL。" + +#: ..\..\..\templates/extractors.tpl:4 +msgid "Supported websites" +msgstr "支持的网站" + +#: ..\..\..\templates/inc/footer.tpl:4 +msgid "Code by" +msgstr "代码来自" + +#: ..\..\..\templates/inc/footer.tpl:6 +msgid "Design by" +msgstr "设计来自" + +#: ..\..\..\templates/inc/footer.tpl:12 +msgid "AllTube Download on Facebook" +msgstr "去Alltube Download的Facebook页面" + +#: ..\..\..\templates/inc/footer.tpl:12 +msgid "Like us on Facebook" +msgstr "在Facebook关注我们" + +#: ..\..\..\templates/inc/footer.tpl:14 +msgid "Get the code" +msgstr "获取代码" + +#: ..\..\..\templates/inc/footer.tpl:16 +msgid "Based on" +msgstr "基于" + +#: ..\..\..\templates/inc/header.tpl:4 +msgid "Share on Twitter" +msgstr "分享到 Twitter" + +#: ..\..\..\templates/inc/header.tpl:5 +msgid "Share on Facebook" +msgstr "分享到 Facebook" + +#: ..\..\..\templates/index.tpl:9 msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)" msgstr "在这里复制您的视频 （Youtube、 Dailymotion 等） 的 URL" -#: E:\GitKraken\alltube\templates/index.tpl:19 +#: ..\..\..\templates/index.tpl:19 ..\..\..\templates/password.tpl:10 +#: ..\..\..\templates/playlist.tpl:23 ..\..\..\templates/video.tpl:85 +#: ..\..\..\templates/video.tpl:90 msgid "Download" msgstr "下载" -#: E:\GitKraken\alltube\templates/index.tpl:24 +#: ..\..\..\templates/index.tpl:24 msgid "Audio only (MP3)" msgstr "仅限音频（mp3）" -#: E:\GitKraken\alltube\templates/index.tpl:29 +#: ..\..\..\templates/index.tpl:29 msgid "See all supported websites" msgstr "请参阅支持的所有网站" -#: E:\GitKraken\alltube\templates/index.tpl:31 +#: ..\..\..\templates/index.tpl:31 msgid "Drag this to your bookmarks bar:" -msgstr "把这个拖到你的书签栏︰" +msgstr "把这个拖到你的书签：" -#: E:\GitKraken\alltube\templates/index.tpl:32 +#: ..\..\..\templates/index.tpl:32 msgid "Bookmarklet" msgstr "书签工具" + +#: ..\..\..\templates/password.tpl:5 +msgid "This video is protected" +msgstr "这个视频受保护" + +#: ..\..\..\templates/password.tpl:6 +msgid "You need a password in order to download this video." +msgstr "你需要密码才能下载这个视频。" + +#: ..\..\..\templates/password.tpl:8 +msgid "Video password" +msgstr "视频密码" + +#: ..\..\..\templates/playlist.tpl:5 +msgid "Videos extracted from the" +msgstr "视频从" + +#: ..\..\..\templates/playlist.tpl:7 +msgid "playlist:" +msgstr "播放列表提取：" + +#: ..\..\..\templates/playlist.tpl:24 +msgid "More options" +msgstr "更多选项" + +#: ..\..\..\templates/video.tpl:6 +msgid "You are going to download" +msgstr "你即将下载：" + +#: ..\..\..\templates/video.tpl:24 +msgid "Available formats:" +msgstr "可用的格式︰" + +#: ..\..\..\templates/video.tpl:31 +msgid "Generic formats" +msgstr "通用格式" + +#: ..\..\..\templates/video.tpl:34 +msgid "Best" +msgstr "最佳" + +#: ..\..\..\templates/video.tpl:39 +msgid "Remux best video with best audio" +msgstr "重新封装最佳视频与最佳音频" + +#: ..\..\..\templates/video.tpl:43 +msgid "Worst" +msgstr "最差" + +#: ..\..\..\templates/video.tpl:46 +msgid "Detailed formats" +msgstr "详细格式" diff --git a/templates/error.tpl b/templates/error.tpl index 67a0fae..ded9676 100644 --- a/templates/error.tpl +++ b/templates/error.tpl @@ -2,8 +2,8 @@
{include file="inc/logo.tpl"} -

An error occured

- Please check the URL of your video. +

{t}An error occured{/t}

+ {t}Please check the URL of your video.{/t}

{foreach $errors as $error} {$error|escape} diff --git a/templates/extractors.tpl b/templates/extractors.tpl index 4944193..fb85994 100644 --- a/templates/extractors.tpl +++ b/templates/extractors.tpl @@ -1,7 +1,7 @@ {include file='inc/head.tpl'} {include file='inc/header.tpl'} {include file='inc/logo.tpl'} -

Supported websites

+

{t}Supported websites{/t}

    {foreach $extractors as $extractor} diff --git a/templates/inc/footer.tpl b/templates/inc/footer.tpl index c5797fc..b9ff314 100644 --- a/templates/inc/footer.tpl +++ b/templates/inc/footer.tpl @@ -1,19 +1,19 @@
diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index fc42083..628b0f7 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -1,8 +1,8 @@
diff --git a/templates/password.tpl b/templates/password.tpl index ab8e302..a4c56f2 100644 --- a/templates/password.tpl +++ b/templates/password.tpl @@ -2,12 +2,12 @@
{include file="inc/logo.tpl"} -

This video is protected

-

You need a password in order to download this video.

+

{t}This video is protected{/t}

+

{t}You need a password in order to download this video.{/t}

- +

- +
{include file='inc/footer.tpl'} diff --git a/templates/playlist.tpl b/templates/playlist.tpl index f6c9f22..c88d739 100644 --- a/templates/playlist.tpl +++ b/templates/playlist.tpl @@ -2,9 +2,9 @@
{include file="inc/logo.tpl"} -

Videos extracted from the {if isset($video->title)} +

{t}Videos extracted from the{/t} {if isset($video->title)} -{$video->title}{/if} playlist: +{$video->title}{/if} {t}playlist:{/t}

{foreach $video->entries as $video}
@@ -20,8 +20,8 @@ {$video->title} {/if} - url}">Download - url}">More options + url}">{t}Download{/t} + url}">{t}More options{/t}
{/foreach} diff --git a/templates/video.tpl b/templates/video.tpl index 64ca555..a2e1601 100644 --- a/templates/video.tpl +++ b/templates/video.tpl @@ -3,7 +3,7 @@ From bb6e2805f31e5ed7904df507e4d832f8f4cd0c10 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 May 2017 04:50:58 -0700 Subject: [PATCH 4/9] Setup accoring standard --- .../{zh_CN.mo => zh_CN/LC_MESSAGES/Alltube.mo} | Bin .../{zh_CN.po => zh_CN/LC_MESSAGES/Alltube.po} | 0 templates/inc/head.tpl | 6 ++++++ 3 files changed, 6 insertions(+) rename templates/Translations/{zh_CN.mo => zh_CN/LC_MESSAGES/Alltube.mo} (100%) rename templates/Translations/{zh_CN.po => zh_CN/LC_MESSAGES/Alltube.po} (100%) diff --git a/templates/Translations/zh_CN.mo b/templates/Translations/zh_CN/LC_MESSAGES/Alltube.mo similarity index 100% rename from templates/Translations/zh_CN.mo rename to templates/Translations/zh_CN/LC_MESSAGES/Alltube.mo diff --git a/templates/Translations/zh_CN.po b/templates/Translations/zh_CN/LC_MESSAGES/Alltube.po similarity index 100% rename from templates/Translations/zh_CN.po rename to templates/Translations/zh_CN/LC_MESSAGES/Alltube.po diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index 4d884d3..2bdf6e8 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -1,3 +1,9 @@ +{locale path="Translations" domain="AllTube"} + From 404935be050c48b4d517f206d4c404153fd3376b Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 May 2017 11:38:34 -0700 Subject: [PATCH 5/9] Possible fix recommend by Rudloff --- composer.json | 2 +- index.php | 5 +++++ templates/inc/head.tpl | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 6084112..ad330f7 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "guzzlehttp/guzzle": "~6.2.0", "rudloff/rtmpdump-bin": "~2.3", "aura/session": "~2.1.0", - "smarty-gettext/smarty-gettext": "~1.2.0" + "smarty-gettext/smarty-gettext": "~1.5.1" }, "require-dev": { "symfony/var-dumper": "~3.2.0", diff --git a/index.php b/index.php index 0bb2c6e..9132a80 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,10 @@ From 1e1b97c648ca6082210e3e0c9268c529bf774f5a Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 May 2017 11:45:05 -0700 Subject: [PATCH 6/9] Name Correction --- .../Translations/zh_CN/LC_MESSAGES/Alltube.mo | Bin 2222 -> 2219 bytes .../Translations/zh_CN/LC_MESSAGES/Alltube.po | 2 +- templates/inc/head.tpl | 2 +- templates/index.tpl | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/Translations/zh_CN/LC_MESSAGES/Alltube.mo b/templates/Translations/zh_CN/LC_MESSAGES/Alltube.mo index 3507120b32be0e93e8cedf03e35ce0437045fbd7..bc85ce753656a9b741db2a71e9c9587f837dd45e 100644 GIT binary patch delta 38 pcmZ1{xLR<-7e-Nj1_p*G4h9A-Ae{xIMS=9x&74dLY?E_1oB*3_2U-9C delta 42 ucmZ22xK41x7e-Mb1_p*G4h9A-Ae{@OMS=8;&74dLY|QWX%$l6Z;RFD}ehH`m diff --git a/templates/Translations/zh_CN/LC_MESSAGES/Alltube.po b/templates/Translations/zh_CN/LC_MESSAGES/Alltube.po index 11c17f7..d0bc3e0 100644 --- a/templates/Translations/zh_CN/LC_MESSAGES/Alltube.po +++ b/templates/Translations/zh_CN/LC_MESSAGES/Alltube.po @@ -108,7 +108,7 @@ msgstr "更多选项" #: ..\..\..\templates/video.tpl:6 msgid "You are going to download" -msgstr "你即将下载：" +msgstr "你即将下载" #: ..\..\..\templates/video.tpl:24 msgid "Available formats:" diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index db02589..e2e9c9e 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -1,4 +1,4 @@ -{locale path="Translations" domain="AllTube"} +{locale path="Translations" domain="Alltube"} diff --git a/templates/index.tpl b/templates/index.tpl index 3b3af98..26adbd2 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -1,6 +1,6 @@ {include file='inc/head.tpl'} {include file='inc/header.tpl'} -{locale path="Translations" domain="AllTube"} +{locale path="Translations" domain="Alltube"}
From 508c32e797a4d4cb61eb00d8905cf49528dc020f Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 May 2017 14:59:30 -0700 Subject: [PATCH 7/9] Use correct local code --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 9132a80..20c3b0b 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ $language = "zh_CN"; putenv("LANG=".$language); -setlocale(LC_ALL, $language); +setlocale(LC_ALL, [$language, $language.'.utf8']); require_once __DIR__.'/vendor/autoload.php'; use Alltube\Config; From e8d989a9f26d8fc4e4dfe317e131c4ab4c8e33ab Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 26 May 2017 15:04:33 -0700 Subject: [PATCH 8/9] Fix syntax by styleci --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 20c3b0b..94be05e 100644 --- a/index.php +++ b/index.php @@ -1,8 +1,8 @@ Date: Sat, 27 May 2017 00:41:30 +0000 Subject: [PATCH 9/9] Update composer.lock --- composer.lock | 167 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 110 insertions(+), 57 deletions(-) diff --git a/composer.lock b/composer.lock index 7568e3b..a574f2c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "0a4bd158955df2e3f5ea89714ba9e740", - "content-hash": "cb0e773496b6f26caf1c8591f23488f5", + "content-hash": "97ff03d2e057a45f013ed300f8aa168d", "packages": [ { "name": "aura/session", @@ -67,7 +66,7 @@ "session", "sessions" ], - "time": "2016-10-03 20:28:32" + "time": "2016-10-03T20:28:32+00:00" }, { "name": "container-interop/container-interop", @@ -98,7 +97,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14 19:40:03" + "time": "2017-02-14T19:40:03+00:00" }, { "name": "guzzlehttp/guzzle", @@ -160,7 +159,7 @@ "rest", "web service" ], - "time": "2017-02-28 22:50:30" + "time": "2017-02-28T22:50:30+00:00" }, { "name": "guzzlehttp/promises", @@ -211,7 +210,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20 10:07:11" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", @@ -276,7 +275,7 @@ "uri", "url" ], - "time": "2017-03-20 17:10:46" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "mathmarques/smarty-view", @@ -326,7 +325,7 @@ "template", "view" ], - "time": "2016-08-25 19:04:49" + "time": "2016-08-25T19:04:49+00:00" }, { "name": "nikic/fast-route", @@ -369,7 +368,7 @@ "router", "routing" ], - "time": "2017-01-19 11:35:12" + "time": "2017-01-19T11:35:12+00:00" }, { "name": "pimple/pimple", @@ -415,7 +414,7 @@ "container", "dependency injection" ], - "time": "2015-09-11 15:10:35" + "time": "2015-09-11T15:10:35+00:00" }, { "name": "psr/container", @@ -464,7 +463,7 @@ "container-interop", "psr" ], - "time": "2017-02-14 16:28:37" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/http-message", @@ -514,7 +513,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "ptachoire/process-builder-chain", @@ -550,7 +549,7 @@ } ], "description": "Add ability to chain symfony processes", - "time": "2016-04-10 08:33:20" + "time": "2016-04-10T08:33:20+00:00" }, { "name": "rudloff/rtmpdump-bin", @@ -578,7 +577,7 @@ "GPL-2.0" ], "description": "rtmpdump binary for Linux 64 bit", - "time": "2016-04-12 19:17:32" + "time": "2016-04-12T19:17:32+00:00" }, { "name": "slim/slim", @@ -649,7 +648,61 @@ "micro", "router" ], - "time": "2017-03-19 17:55:20" + "time": "2017-03-19T17:55:20+00:00" + }, + { + "name": "smarty-gettext/smarty-gettext", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/smarty-gettext/smarty-gettext.git", + "reference": "00fe2fcbc41e24e0245cd9d73f96bc7b0337972d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/smarty-gettext/smarty-gettext/zipball/00fe2fcbc41e24e0245cd9d73f96bc7b0337972d", + "reference": "00fe2fcbc41e24e0245cd9d73f96bc7b0337972d", + "shasum": "" + }, + "require": { + "ext-gettext": "*", + "ext-pcre": "*", + "php": "~5.3|~7.0" + }, + "require-dev": { + "azatoth/php-pgettext": "~1.0", + "smarty/smarty": "3.1.*" + }, + "suggest": { + "azatoth/php-pgettext": "Support msgctxt for {t} via context parameter" + }, + "bin": [ + "tsmarty2c.php" + ], + "type": "library", + "autoload": { + "files": [ + "block.t.php", + "function.locale.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1+" + ], + "authors": [ + { + "name": "Sagi Bashari", + "email": "sagi@boom.org.il" + }, + { + "name": "Elan Ruusamäe", + "email": "glen@delfi.ee" + } + ], + "description": "Gettext plugin enabling internationalization in Smarty Package files", + "homepage": "https://github.com/smarty-gettext/smarty-gettext", + "time": "2017-05-12T12:14:46+00:00" }, { "name": "smarty/smarty", @@ -702,7 +755,7 @@ "keywords": [ "templating" ], - "time": "2016-12-14 21:57:25" + "time": "2016-12-14T21:57:25+00:00" }, { "name": "symfony/process", @@ -751,7 +804,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-04-12 14:13:17" + "time": "2017-04-12T14:13:17+00:00" }, { "name": "symfony/yaml", @@ -806,7 +859,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-05-01 14:55:58" + "time": "2017-05-01T14:55:58+00:00" } ], "packages-dev": [ @@ -862,7 +915,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "ffmpeg/ffmpeg", @@ -920,7 +973,7 @@ "nginx", "php" ], - "time": "2017-03-27 23:33:27" + "time": "2017-03-27T23:33:27+00:00" }, { "name": "myclabs/deep-copy", @@ -962,7 +1015,7 @@ "object", "object graph" ], - "time": "2017-04-12 18:52:22" + "time": "2017-04-12T18:52:22+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1016,7 +1069,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -1061,7 +1114,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30 07:12:33" + "time": "2016-09-30T07:12:33+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1108,7 +1161,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2016-11-25T06:54:22+00:00" }, { "name": "phpspec/prophecy", @@ -1171,7 +1224,7 @@ "spy", "stub" ], - "time": "2017-03-02 20:05:34" + "time": "2017-03-02T20:05:34+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1234,7 +1287,7 @@ "testing", "xunit" ], - "time": "2017-04-02 07:44:40" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1281,7 +1334,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -1322,7 +1375,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -1371,7 +1424,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26 11:10:40" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", @@ -1420,20 +1473,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27 10:12:30" + "time": "2017-02-27T10:12:30+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.19", + "version": "5.7.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1" + "reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69c4f49ff376af2692bad9cebd883d17ebaa98a1", - "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3cb94a5f8c07a03c8b7527ed7468a2926203f58b", + "reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b", "shasum": "" }, "require": { @@ -1451,7 +1504,7 @@ "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^3.2", "sebastian/comparator": "^1.2.4", - "sebastian/diff": "~1.2", + "sebastian/diff": "^1.4.3", "sebastian/environment": "^1.3.4 || ^2.0", "sebastian/exporter": "~2.0", "sebastian/global-state": "^1.1", @@ -1502,7 +1555,7 @@ "testing", "xunit" ], - "time": "2017-04-03 02:22:27" + "time": "2017-05-22T07:42:55+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -1561,7 +1614,7 @@ "mock", "xunit" ], - "time": "2016-12-08 20:27:08" + "time": "2016-12-08T20:27:08+00:00" }, { "name": "rg3/youtube-dl", @@ -1617,7 +1670,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04 06:30:41" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -1681,27 +1734,27 @@ "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -1733,7 +1786,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -1783,7 +1836,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -1850,7 +1903,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -1901,7 +1954,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -1947,7 +2000,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18 15:18:39" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", @@ -2000,7 +2053,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -2042,7 +2095,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -2085,7 +2138,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -2163,7 +2216,7 @@ "phpcs", "standards" ], - "time": "2017-03-01 22:17:45" + "time": "2017-03-01T22:17:45+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -2222,7 +2275,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/var-dumper", @@ -2290,7 +2343,7 @@ "debug", "dump" ], - "time": "2017-05-01 14:55:58" + "time": "2017-05-01T14:55:58+00:00" }, { "name": "webmozart/assert", @@ -2340,7 +2393,7 @@ "check", "validate" ], - "time": "2016-11-23 20:04:58" + "time": "2016-11-23T20:04:58+00:00" } ], "aliases": [],