From 3ee71db762b402e4b31794d76cf40a348463246b Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 25 May 2017 23:55:04 -0700 Subject: [PATCH 01/37] 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 02/37] 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 03/37] 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 04/37] 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 05/37] 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 06/37] 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 07/37] 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 08/37] 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 09/37] 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": [], From ff247a5c089d32f2873db21ec21b6bf1f45c9736 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 29 May 2017 19:02:48 +0200 Subject: [PATCH 10/37] Move gettext files outside of template directory --- {templates/Translations => i18n}/template.pot | 0 .../zh_CN/LC_MESSAGES/Alltube.mo | Bin .../zh_CN/LC_MESSAGES/Alltube.po | 0 templates/inc/head.tpl | 2 +- templates/index.tpl | 1 - 5 files changed, 1 insertion(+), 2 deletions(-) rename {templates/Translations => i18n}/template.pot (100%) rename {templates/Translations => i18n}/zh_CN/LC_MESSAGES/Alltube.mo (100%) rename {templates/Translations => i18n}/zh_CN/LC_MESSAGES/Alltube.po (100%) diff --git a/templates/Translations/template.pot b/i18n/template.pot similarity index 100% rename from templates/Translations/template.pot rename to i18n/template.pot diff --git a/templates/Translations/zh_CN/LC_MESSAGES/Alltube.mo b/i18n/zh_CN/LC_MESSAGES/Alltube.mo similarity index 100% rename from templates/Translations/zh_CN/LC_MESSAGES/Alltube.mo rename to i18n/zh_CN/LC_MESSAGES/Alltube.mo diff --git a/templates/Translations/zh_CN/LC_MESSAGES/Alltube.po b/i18n/zh_CN/LC_MESSAGES/Alltube.po similarity index 100% rename from templates/Translations/zh_CN/LC_MESSAGES/Alltube.po rename to i18n/zh_CN/LC_MESSAGES/Alltube.po diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index 9e63035..3c8c116 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -1,4 +1,4 @@ -{locale path="Translations" domain="Alltube"} +{locale path="../i18n" domain="Alltube"} diff --git a/templates/index.tpl b/templates/index.tpl index ab3ea6c..2f48a1f 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -1,6 +1,5 @@ {include file='inc/head.tpl'} {include file='inc/header.tpl'} -{locale path="Translations" domain="Alltube"}
From ce1cbe3e0fd14223b322a6d8aab28309565390ad Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 29 May 2017 19:11:16 +0200 Subject: [PATCH 11/37] Generate .mo files with Grunt --- .gitignore | 1 + Gruntfile.js | 13 ++++++++++++- i18n/zh_CN/LC_MESSAGES/Alltube.mo | Bin 2219 -> 0 bytes package.json | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) delete mode 100644 i18n/zh_CN/LC_MESSAGES/Alltube.mo diff --git a/.gitignore b/.gitignore index 66be2e1..0823947 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ bower_components/ config/config.yml docs/ clover.xml +i18n/*/LC_MESSAGES/*.mo diff --git a/Gruntfile.js b/Gruntfile.js index 8f75c48..ad307cf 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -90,6 +90,16 @@ module.exports = function (grunt) { package: { src: 'package.json' } + }, + potomo: { + dist: { + options: { + poDel: false + }, + files: { + 'i18n/zh_CN/LC_MESSAGES/Alltube.mo': 'i18n/zh_CN/LC_MESSAGES/Alltube.po' + } + } } } ); @@ -105,8 +115,9 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-phpdocumentor'); grunt.loadNpmTasks('grunt-jsonlint'); grunt.loadNpmTasks('grunt-fixpack'); + grunt.loadNpmTasks('grunt-potomo'); - grunt.registerTask('default', ['uglify', 'cssmin']); + grunt.registerTask('default', ['uglify', 'cssmin', 'potomo']); grunt.registerTask('lint', ['jslint', 'fixpack', 'jsonlint', 'phpcs']); grunt.registerTask('test', ['phpunit']); grunt.registerTask('doc', ['phpdocumentor']); diff --git a/i18n/zh_CN/LC_MESSAGES/Alltube.mo b/i18n/zh_CN/LC_MESSAGES/Alltube.mo deleted file mode 100644 index bc85ce753656a9b741db2a71e9c9587f837dd45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2219 zcmZvc`*Raj6vwZE4+1_wL=@3GqbM*W@(>3CIF^PojIDNPc=?O7Np72^o4s*&Lx~PE zDcbabZ9xmzT7&|H4zJd!+R_KiIF3L1gFpF$qd$<{BtKRE1HUJ`Y3t}tZ$5kO-h0mX zoO5sgShnyi!}Bu6ix|rvVr(6_Iobv1+!8c+54wAm5__!W5SOvZcyXsMQz7c#Db_yi_ zr$GF%Z#)iyr2Ce~yI=_R&z`*)#h~viK}@kV;7i~JZ~k46he6UUJo^Mlz3Bj72XBD1 z?^lp?{0&n63sFp}-wKd)z6Mgfogn4452UztAg%iVTn`=vY5iFcX_wxCQV%gzdQcj+ z+Iug9G*Vo&qx7u6?{W;Pb@`#Vq`mx5f1bdgK2UF0Vo)zg*D4IsOF8*4C`ZzX^cap< zsn>K4S%s#BQxU;KvPsvZ65~?mRZ3Juq-HzA;9*FMCv$?pafo0O{x`lZH0=+>V)8mrg1ZsOiIH-8ciZ%s+KTWU0k7P z^BOTb6NVd07_9EUyTX*OTR^-d4QYue+_HnEnkE&~Y?6j&np_;W428b)dP62C3wB5v zXc%hGDSU%ebrezZn0GQtUvz;T3NL%(s?On581ompl`km?u%xD>HPy6&tk#f6p~$~4 z=07M56O{~dU+w#0f2AQ5Dy%=GSfVuN-!G1-w4yv!t(cZSY$&>^DV8*Xye_VOq$&`2 zB*k}HQcrK%zJ2S~t#56Ary+qu5s1pf+rDZnNGT1%9~Mdij>~qCe;og?@;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 z`ni3z({B60IZ18`*R$}?5x~2i4>Ha3FDTF7Zbw{>rF5rR;m*CnodM5dVfb2pGV3Z~ zx$#ql>1pP4bRbG@{DyPtoZU8(o4$mtuBe%*K32^1LBF@9&^2avpL0c$ymBqq7Rg2Rz?0nt~4^Df=>2J?ZpUL0sWp-OOH*pj4=l*NXO_gu!>{f4+ zo3xAvx1FAQcH8;Fz>w2@8il0#{sX;9=5qi5 diff --git a/package.json b/package.json index e62d84a..14ca609 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "bower": "~1.8.0", "grunt": "~1.0.1", "grunt-contrib-cssmin": "~2.2.0", - "grunt-contrib-uglify": "~3.0.0" + "grunt-contrib-uglify": "~3.0.0", + "grunt-potomo": "~3.5.0" }, "devDependencies": { "grunt-contrib-compress": "~1.4.1", From de8c4525d92d833c82a3c37a35fe8a36f0a27e4f Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 29 May 2017 19:28:42 +0200 Subject: [PATCH 12/37] New fr_FR locale --- Gruntfile.js | 1 + i18n/fr_FR/LC_MESSAGES/Alltube.po | 134 ++++++++++++++++ i18n/template.pot | 247 +++++++++++++++--------------- index.php | 2 +- templates/playlist.tpl | 4 +- 5 files changed, 261 insertions(+), 127 deletions(-) create mode 100644 i18n/fr_FR/LC_MESSAGES/Alltube.po diff --git a/Gruntfile.js b/Gruntfile.js index ad307cf..050b970 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -97,6 +97,7 @@ module.exports = function (grunt) { poDel: false }, files: { + 'i18n/fr_FR/LC_MESSAGES/Alltube.mo': 'i18n/fr_FR/LC_MESSAGES/Alltube.po', 'i18n/zh_CN/LC_MESSAGES/Alltube.mo': 'i18n/zh_CN/LC_MESSAGES/Alltube.po' } } diff --git a/i18n/fr_FR/LC_MESSAGES/Alltube.po b/i18n/fr_FR/LC_MESSAGES/Alltube.po new file mode 100644 index 0000000..8fcb988 --- /dev/null +++ b/i18n/fr_FR/LC_MESSAGES/Alltube.po @@ -0,0 +1,134 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Pierre Rudloff \n" +"Language-Team: \n" +"Language: fr_FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.6.10\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: templates/error.tpl:5 +msgid "An error occured" +msgstr "Une erreur est survenue" + +#: templates/error.tpl:6 +msgid "Please check the URL of your video." +msgstr "Veuillez vérifier l'URL de votre vidéo" + +#: templates/playlist.tpl:5 +msgid "Videos extracted from" +msgstr "Vidéos extraites depuis" + +#: templates/playlist.tpl:7 +msgid ":" +msgstr " :" + +#: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:85 +#: templates/video.tpl:88 templates/index.tpl:18 +msgid "Download" +msgstr "Télécharger" + +#: templates/playlist.tpl:27 +msgid "More options" +msgstr "Plus d'options" + +#: templates/password.tpl:5 +msgid "This video is protected" +msgstr "Cette vidéo est protégée" + +#: templates/password.tpl:6 +msgid "You need a password in order to download this video." +msgstr "L'accès à cette vidéo nécessite un mot de passe." + +#: templates/password.tpl:8 +msgid "Video password" +msgstr "Mot de passe de la vidéo" + +#: templates/extractors.tpl:4 +msgid "Supported websites" +msgstr "Sites web supportés" + +#: templates/video.tpl:6 +msgid "You are going to download" +msgstr "Vous allez télécharger" + +#: templates/video.tpl:26 +msgid "Available formats:" +msgstr "Formats disponibles :" + +#: templates/video.tpl:31 +msgid "Generic formats" +msgstr "Formats génériques" + +#: templates/video.tpl:34 +msgid "Best" +msgstr "Meilleure qualité" + +#: templates/video.tpl:39 +msgid "Remux best video with best audio" +msgstr "Combiner la meilleure vidéo avec le meilleur audio" + +#: templates/video.tpl:43 +msgid "Worst" +msgstr "Pire qualité" + +#: templates/video.tpl:46 +msgid "Detailed formats" +msgstr "Formats détaillés" + +#: templates/inc/footer.tpl:4 +msgid "Code by" +msgstr "Développé par" + +#: templates/inc/footer.tpl:6 +msgid "Design by" +msgstr "Designé par" + +#: templates/inc/footer.tpl:12 +msgid "AllTube Download on Facebook" +msgstr "AllTube Download sur Facebook" + +#: templates/inc/footer.tpl:12 +msgid "Like us on Facebook" +msgstr "Suivez-nous sur Facebook" + +#: templates/inc/footer.tpl:14 +msgid "Get the code" +msgstr "Obtenir le code" + +#: templates/inc/footer.tpl:16 +msgid "Based on" +msgstr "Basé sur" + +#: templates/inc/header.tpl:4 +msgid "Share on Twitter" +msgstr "Partager sur Twitter" + +#: templates/inc/header.tpl:5 +msgid "Share on Facebook" +msgstr "Partager sur Facebook" + +#: templates/index.tpl:8 +msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)" +msgstr "Copiez ici l'URL de votre vidéo (Youtube, Dailymotion, etc.)" + +#: templates/index.tpl:23 +msgid "Audio only (MP3)" +msgstr "Audio uniquement (MP3)" + +#: templates/index.tpl:28 +msgid "See all supported websites" +msgstr "Voir tous les sites supportés" + +#: templates/index.tpl:30 +msgid "Drag this to your bookmarks bar:" +msgstr "Glissez ce lien dans votre barre de favoris :" + +#: templates/index.tpl:31 +msgid "Bookmarklet" +msgstr "Bookmarklet" diff --git a/i18n/template.pot b/i18n/template.pot index e4178ba..7db980d 100644 --- a/i18n/template.pot +++ b/i18n/template.pot @@ -1,124 +1,123 @@ -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 "" +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/playlist.tpl:5 +msgid "Videos extracted from" +msgstr "" + +#: templates/playlist.tpl:7 +msgid ":" +msgstr "" + +#: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:85 +#: templates/video.tpl:88 templates/index.tpl:18 +msgid "Download" +msgstr "" + +#: templates/playlist.tpl:27 +msgid "More options" +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/extractors.tpl:4 +msgid "Supported websites" +msgstr "" + +#: templates/video.tpl:6 +msgid "You are going to download" +msgstr "" + +#: templates/video.tpl:26 +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 "" + +#: 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:8 +msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)" +msgstr "" + +#: templates/index.tpl:23 +msgid "Audio only (MP3)" +msgstr "" + +#: templates/index.tpl:28 +msgid "See all supported websites" +msgstr "" + +#: templates/index.tpl:30 +msgid "Drag this to your bookmarks bar:" +msgstr "" + +#: templates/index.tpl:31 +msgid "Bookmarklet" +msgstr "" diff --git a/index.php b/index.php index e0231ac..5c0c8ca 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@
{include file="inc/logo.tpl"} -

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

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

{if $config->stream} webpage_url}" class="downloadBtn">Download everything From 68b2cca89954250770999c99a60d1ed12d9164a3 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 29 May 2017 21:11:59 +0200 Subject: [PATCH 13/37] Detect user locale --- classes/LocaleMiddleware.php | 61 ++++++++++++++++++++++++++++ composer.json | 3 +- composer.lock | 43 +++++++++++++++++++- index.php | 7 +--- tests/LocaleMiddlewareTest.php | 73 ++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 7 deletions(-) create mode 100644 classes/LocaleMiddleware.php create mode 100644 tests/LocaleMiddlewareTest.php diff --git a/classes/LocaleMiddleware.php b/classes/LocaleMiddleware.php new file mode 100644 index 0000000..3a743e0 --- /dev/null +++ b/classes/LocaleMiddleware.php @@ -0,0 +1,61 @@ +locales as $locale) { + $parsedLocale = AcceptLanguage::parse($locale); + if (isset($proposedLocale['language']) + && $parsedLocale[1]['language'] == $proposedLocale['language'] + && $parsedLocale[1]['region'] == $proposedLocale['region'] + ) { + return $proposedLocale['language'].'_'.$proposedLocale['region']; + } + } + } + + /** + * Main middleware function + * + * @param Request $request PSR request + * @param Response $response PSR response + * @param callable $next Next middleware + * + * @return Response + */ + public function __invoke(Request $request, Response $response, callable $next) + { + $headers = $request->getHeader('Accept-Language'); + $locale = AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0]); + putenv('LANG='.$locale); + setlocale(LC_ALL, [$locale, $locale.'.utf8']); + + return $next($request, $response); + } +} diff --git a/composer.json b/composer.json index fda6dc9..e977748 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ "guzzlehttp/guzzle": "~6.2.0", "aura/session": "~2.1.0", "barracudanetworks/archivestream-php": "~1.0.5", - "smarty-gettext/smarty-gettext": "~1.5.1" + "smarty-gettext/smarty-gettext": "~1.5.1", + "zonuexe/http-accept-language": "~0.4.1" }, "require-dev": { "symfony/var-dumper": "~3.2.0", diff --git a/composer.lock b/composer.lock index f2c62ae..a4ac43a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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" ], - "content-hash": "9793382606938199471cea3e8c7cbb6c", + "content-hash": "44c4a3592a8eac7111a7284b22e55868", "packages": [ { "name": "aura/session", @@ -872,6 +872,47 @@ "description": "Symfony Yaml Component", "homepage": "https://symfony.com", "time": "2017-05-01T14:55:58+00:00" + }, + { + "name": "zonuexe/http-accept-language", + "version": "0.4.1", + "source": { + "type": "git", + "url": "https://github.com/BaguettePHP/http-accept-language.git", + "reference": "f71422b1200737aa9d7c7fa83f07cbe4616198d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/BaguettePHP/http-accept-language/zipball/f71422b1200737aa9d7c7fa83f07cbe4616198d5", + "reference": "f71422b1200737aa9d7c7fa83f07cbe4616198d5", + "shasum": "" + }, + "require": { + "ext-intl": "*" + }, + "require-dev": { + "phploc/phploc": "*", + "phpunit/phpunit": "4.1.*", + "theseer/phpdox": "0.6.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Teto\\HTTP\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "USAMI Kenta", + "email": "tadsan@zonu.me" + } + ], + "description": "HTTP Accept-Language Header parser", + "time": "2014-10-19T09:22:18+00:00" } ], "packages-dev": [ diff --git a/index.php b/index.php index 5c0c8ca..0be9a33 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,9 @@ add(new LocaleMiddleware()); $container = $app->getContainer(); $config = Config::getInstance(); if ($config->uglyUrls) { diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php new file mode 100644 index 0000000..1f5e690 --- /dev/null +++ b/tests/LocaleMiddlewareTest.php @@ -0,0 +1,73 @@ +middleware = new LocaleMiddleware(); + } + + /** + * Test the testLocale() function. + * + * @return void + */ + public function testTestLocale() + { + $locale = [ + 'language'=>'fr', + 'region'=>'FR', + ]; + $this->assertEquals('fr_FR', $this->middleware->testLocale($locale)); + } + + /** + * Test the testLocale() function with an unsupported locale. + * + * @return void + */ + public function testLocaleWithWrongLocale() + { + $locale = [ + 'language'=>'foo', + 'region'=>'BAR' + ]; + $this->assertNull($this->middleware->testLocale($locale)); + $this->assertNull($this->middleware->testLocale([])); + } + + /** + * Test the __invoke() function. + * + * @return void + */ + public function testInvoke() + { + $request = Request::createFromEnvironment(Environment::mock()); + $this->middleware->__invoke( + $request->withHeader('Accept-Language', 'fr-FR'), + new Response(), + function () { + } + ); + $this->assertEquals('fr_FR', getenv('LANG')); + $this->assertEquals('fr_FR', setlocale(LC_ALL, null)); + } +} From ac4bca35a32aee12bec2c6dea223cd85fa24e6d6 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 29 May 2017 21:13:10 +0200 Subject: [PATCH 14/37] Lint --- classes/LocaleMiddleware.php | 3 ++- tests/LocaleMiddlewareTest.php | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/LocaleMiddleware.php b/classes/LocaleMiddleware.php index 3a743e0..d885acf 100644 --- a/classes/LocaleMiddleware.php +++ b/classes/LocaleMiddleware.php @@ -2,6 +2,7 @@ /** * LocaleMiddleware class. */ + namespace Alltube; use Slim\Http\Request; @@ -41,7 +42,7 @@ class LocaleMiddleware } /** - * Main middleware function + * Main middleware function. * * @param Request $request PSR request * @param Response $response PSR response diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php index 1f5e690..d350d3f 100644 --- a/tests/LocaleMiddlewareTest.php +++ b/tests/LocaleMiddlewareTest.php @@ -15,7 +15,6 @@ use Slim\Http\Response; */ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase { - /** * Prepare tests. */ @@ -32,8 +31,8 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase public function testTestLocale() { $locale = [ - 'language'=>'fr', - 'region'=>'FR', + 'language'=> 'fr', + 'region' => 'FR', ]; $this->assertEquals('fr_FR', $this->middleware->testLocale($locale)); } @@ -46,8 +45,8 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase public function testLocaleWithWrongLocale() { $locale = [ - 'language'=>'foo', - 'region'=>'BAR' + 'language'=> 'foo', + 'region' => 'BAR', ]; $this->assertNull($this->middleware->testLocale($locale)); $this->assertNull($this->middleware->testLocale([])); From e64bb9b9f56263f9f4ab44fdc09e7c7682a5d20f Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 29 May 2017 22:00:30 +0200 Subject: [PATCH 15/37] Fix tests --- tests/LocaleMiddlewareTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php index d350d3f..de54aee 100644 --- a/tests/LocaleMiddlewareTest.php +++ b/tests/LocaleMiddlewareTest.php @@ -15,14 +15,33 @@ use Slim\Http\Response; */ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase { + /** + * Original locale. + * + * @var string + */ + private $locale; + /** * Prepare tests. */ protected function setUp() { + $this->locale = getenv('LANG'); $this->middleware = new LocaleMiddleware(); } + /** + * Restore environment after the tests. + * + * @return void + */ + protected function tearDown() + { + putenv('LANG='.$this->locale); + setlocale(LC_ALL, $this->locale); + } + /** * Test the testLocale() function. * From b4dd0aeb2932cc254ab55d1bb6b1d8508df63658 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 22:20:16 +0200 Subject: [PATCH 16/37] Basic locale switcher --- classes/LocaleManager.php | 77 +++++++++++++++++++++++++++++++++ classes/LocaleMiddleware.php | 21 ++++++--- controllers/FrontController.php | 23 ++++++++++ css/style.css | 7 ++- index.php | 8 +++- templates/inc/head.tpl | 2 +- templates/inc/header.tpl | 7 +++ 7 files changed, 135 insertions(+), 10 deletions(-) create mode 100644 classes/LocaleManager.php diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php new file mode 100644 index 0000000..f581bc5 --- /dev/null +++ b/classes/LocaleManager.php @@ -0,0 +1,77 @@ +newInstance($cookies); + $this->sessionSegment = $session->getSegment('Alltube\LocaleManager'); + $this->setLocale($this->sessionSegment->get('locale')); + } + + /** + * Get a list of supported locales. + * + * @return array + */ + public function getSupportedLocales() + { + $return = []; + foreach ($this->supportedLocales as $supportedLocale) { + $return[$supportedLocale] = \Locale::getDisplayName($supportedLocale, $this->curLocale); + } + + return $return; + } + + /** + * Get the current locale. + * + * @return string + */ + public function getLocale() + { + return $this->curLocale; + } + + /** + * Set the current locale. + * + * @param string $locale Locale code. + */ + public function setLocale($locale) + { + putenv('LANG='.$locale); + setlocale(LC_ALL, [$locale, $locale.'.utf8']); + $this->curLocale = $locale; + $this->sessionSegment->set('locale', $locale); + } +} diff --git a/classes/LocaleMiddleware.php b/classes/LocaleMiddleware.php index d885acf..19593c5 100644 --- a/classes/LocaleMiddleware.php +++ b/classes/LocaleMiddleware.php @@ -5,6 +5,7 @@ namespace Alltube; +use Psr\Container\ContainerInterface; use Slim\Http\Request; use Slim\Http\Response; use Teto\HTTP\AcceptLanguage; @@ -15,11 +16,14 @@ use Teto\HTTP\AcceptLanguage; class LocaleMiddleware { /** - * Supported locales. + * LocaleMiddleware constructor. * - * @var array + * @param ContainerInterface $container Slim dependency container */ - private $locales = ['fr_FR', 'zh_CN']; + public function __construct(ContainerInterface $container) + { + $this->locale = $container->get('locale'); + } /** * Test if a locale can be used for the current user. @@ -30,7 +34,7 @@ class LocaleMiddleware */ public function testLocale(array $proposedLocale) { - foreach ($this->locales as $locale) { + foreach ($this->locale->getSupportedLocales() as $locale => $name) { $parsedLocale = AcceptLanguage::parse($locale); if (isset($proposedLocale['language']) && $parsedLocale[1]['language'] == $proposedLocale['language'] @@ -53,9 +57,12 @@ class LocaleMiddleware public function __invoke(Request $request, Response $response, callable $next) { $headers = $request->getHeader('Accept-Language'); - $locale = AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0]); - putenv('LANG='.$locale); - setlocale(LC_ALL, [$locale, $locale.'.utf8']); + $curLocale = $this->locale->getLocale(); + if (!isset($curLocale)) { + $this->locale->setLocale( + AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0]) + ); + } return $next($request, $response); } diff --git a/controllers/FrontController.php b/controllers/FrontController.php index bbcc358..5a2aa16 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -78,6 +78,7 @@ class FrontController $this->download = new VideoDownload(); $this->container = $container; $this->view = $this->container->get('view'); + $this->locale = $this->container->get('locale'); $session_factory = new \Aura\Session\SessionFactory(); $session = $session_factory->newInstance($cookies); $this->sessionSegment = $session->getSegment('Alltube\Controller\FrontController'); @@ -106,12 +107,30 @@ class FrontController 'description' => 'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.', 'domain' => $uri->getScheme().'://'.$uri->getAuthority(), 'canonical' => $this->getCanonicalUrl($request), + 'locales' => $this->locale->getSupportedLocales(), + 'locale' => $this->locale->getLocale(), ] ); return $response; } + /** + * Switch locale. + * + * @param Request $request PSR-7 request + * @param Response $response PSR-7 response + * @param array $data Query parameters + * + * @return Response + */ + public function locale(Request $request, Response $response, array $data) + { + $this->locale->setLocale($data['locale']); + + return $response->withRedirect($this->container->get('router')->pathFor('index')); + } + /** * Display a list of extractors. * @@ -132,6 +151,7 @@ class FrontController 'description' => 'List of all supported websites from which Alltube Download '. 'can extract video or audio files', 'canonical' => $this->getCanonicalUrl($request), + 'locale' => $this->locale->getLocale(), ] ); @@ -156,6 +176,7 @@ class FrontController 'title' => 'Password prompt', 'description' => 'You need a password in order to download this video with Alltube Download', 'canonical' => $this->getCanonicalUrl($request), + 'locale' => $this->locale->getLocale(), ] ); @@ -246,6 +267,7 @@ class FrontController 'protocol' => $protocol, 'config' => $this->config, 'canonical' => $this->getCanonicalUrl($request), + 'locale' => $this->locale->getLocale(), ] ); @@ -297,6 +319,7 @@ class FrontController 'class' => 'video', 'title' => 'Error', 'canonical' => $this->getCanonicalUrl($request), + 'locale' => $this->locale->getLocale(), ] ); diff --git a/css/style.css b/css/style.css index a055a97..42b1bc9 100644 --- a/css/style.css +++ b/css/style.css @@ -23,7 +23,7 @@ header { {padding-right:21px;} -header a +header .social a { overflow:hidden; height:38px; @@ -595,6 +595,11 @@ h1 { font-family:monospace; } +.locales { + float: left; + text-align: left; +} + @media (max-width: 640px) { .formats, .thumb { diff --git a/index.php b/index.php index 0be9a33..89d76e9 100644 --- a/index.php +++ b/index.php @@ -3,6 +3,7 @@ require_once __DIR__.'/vendor/autoload.php'; use Alltube\Config; use Alltube\Controller\FrontController; +use Alltube\LocaleManager; use Alltube\LocaleMiddleware; use Alltube\PlaylistArchiveStream; use Alltube\UglyRouter; @@ -17,13 +18,14 @@ if (isset($_SERVER['REQUEST_URI']) && strpos($_SERVER['REQUEST_URI'], '/index.ph stream_wrapper_register('playlist', PlaylistArchiveStream::class); $app = new App(); -$app->add(new LocaleMiddleware()); $container = $app->getContainer(); $config = Config::getInstance(); if ($config->uglyUrls) { $container['router'] = new UglyRouter(); } $container['view'] = ViewFactory::create($container); +$container['locale'] = new LocaleManager($_COOKIE); +$app->add(new LocaleMiddleware($container)); $controller = new FrontController($container, null, $_COOKIE); @@ -45,4 +47,8 @@ $app->get( '/redirect', [$controller, 'redirect'] )->setName('redirect'); +$app->get( + '/locale/{locale}', + [$controller, 'locale'] +)->setName('locale'); $app->run(); diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index 3c8c116..3fb8052 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -1,6 +1,6 @@ {locale path="../i18n" domain="Alltube"} - + diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 628b0f7..a978372 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -4,5 +4,12 @@ {t}Share on Twitter{/t}
+
    + {if isset($locales)} + {foreach $locales as $locale=>$name} +
  • {$name}
    • + {/foreach} + {/if} +
From 0f80cbd333f17bb838a50342f807a8c35d7886db Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 23:30:21 +0200 Subject: [PATCH 17/37] Improve locale handling --- bower.json | 3 +- classes/Locale.php | 92 +++++++++++++++++++++++++++++++++ classes/LocaleManager.php | 17 +++--- classes/LocaleMiddleware.php | 12 +++-- controllers/FrontController.php | 3 +- templates/inc/head.tpl | 3 +- templates/inc/header.tpl | 4 +- 7 files changed, 118 insertions(+), 16 deletions(-) create mode 100644 classes/Locale.php diff --git a/bower.json b/bower.json index 8c7ffdb..10794c7 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,7 @@ { "name": "alltube", "dependencies": { - "opensans-googlefont": "*" + "opensans-googlefont": "*", + "flag-icon-css": "~2.8.0" } } diff --git a/classes/Locale.php b/classes/Locale.php new file mode 100644 index 0000000..72e84e6 --- /dev/null +++ b/classes/Locale.php @@ -0,0 +1,92 @@ +language = $parse[1]['language']; + $this->region = $parse[1]['region']; + } + + /** + * Convert the locale to a string. + * + * @return string ISO 15897 code + */ + public function __toString() + { + return $this->getIso15897(); + } + + /** + * Get the full name of the locale. + * + * @param Locale $displayLocale Locale to get the name in + * + * @return string + */ + public function getFullName(Locale $displayLocale) + { + return \Locale::getDisplayName($this->getIso15897(), $displayLocale->getIso15897()); + } + + /** + * Get the ISO 15897 code. + * + * @return string + */ + public function getIso15897() + { + return $this->language.'_'.$this->region; + } + + /** + * Get the BCP 47 code. + * + * @return string + */ + public function getBcp47() + { + return $this->language.'-'.$this->region; + } + + /** + * Get the ISO 3166 code. + * + * @return string + */ + public function getIso3166() + { + return strtolower($this->region); + } +} diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php index f581bc5..d031dcc 100644 --- a/classes/LocaleManager.php +++ b/classes/LocaleManager.php @@ -20,7 +20,7 @@ class LocaleManager /** * Current locale. * - * @var string + * @var Locale */ private $curLocale; @@ -34,19 +34,22 @@ class LocaleManager $session_factory = new \Aura\Session\SessionFactory(); $session = $session_factory->newInstance($cookies); $this->sessionSegment = $session->getSegment('Alltube\LocaleManager'); - $this->setLocale($this->sessionSegment->get('locale')); + $cookieLocale = $this->sessionSegment->get('locale'); + if (isset($cookieLocale)) { + $this->setLocale(new Locale($this->sessionSegment->get('locale'))); + } } /** * Get a list of supported locales. * - * @return array + * @return Locale[] */ public function getSupportedLocales() { $return = []; foreach ($this->supportedLocales as $supportedLocale) { - $return[$supportedLocale] = \Locale::getDisplayName($supportedLocale, $this->curLocale); + $return[] = new Locale($supportedLocale); } return $return; @@ -55,7 +58,7 @@ class LocaleManager /** * Get the current locale. * - * @return string + * @return Locale */ public function getLocale() { @@ -65,9 +68,9 @@ class LocaleManager /** * Set the current locale. * - * @param string $locale Locale code. + * @param Locale $locale Locale */ - public function setLocale($locale) + public function setLocale(Locale $locale) { putenv('LANG='.$locale); setlocale(LC_ALL, [$locale, $locale.'.utf8']); diff --git a/classes/LocaleMiddleware.php b/classes/LocaleMiddleware.php index 19593c5..42f3515 100644 --- a/classes/LocaleMiddleware.php +++ b/classes/LocaleMiddleware.php @@ -34,7 +34,7 @@ class LocaleMiddleware */ public function testLocale(array $proposedLocale) { - foreach ($this->locale->getSupportedLocales() as $locale => $name) { + foreach ($this->locale->getSupportedLocales() as $locale) { $parsedLocale = AcceptLanguage::parse($locale); if (isset($proposedLocale['language']) && $parsedLocale[1]['language'] == $proposedLocale['language'] @@ -59,9 +59,13 @@ class LocaleMiddleware $headers = $request->getHeader('Accept-Language'); $curLocale = $this->locale->getLocale(); if (!isset($curLocale)) { - $this->locale->setLocale( - AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0]) - ); + if (isset($headers[0])) { + $this->locale->setLocale( + AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0]) + ); + } else { + $this->locale->setLocale('en_US'); + } } return $next($request, $response); diff --git a/controllers/FrontController.php b/controllers/FrontController.php index 5a2aa16..fb5de9f 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -6,6 +6,7 @@ namespace Alltube\Controller; use Alltube\Config; +use Alltube\Locale; use Alltube\PasswordException; use Alltube\VideoDownload; use Psr\Container\ContainerInterface; @@ -126,7 +127,7 @@ class FrontController */ public function locale(Request $request, Response $response, array $data) { - $this->locale->setLocale($data['locale']); + $this->locale->setLocale(new Locale($data['locale'])); return $response->withRedirect($this->container->get('router')->pathFor('index')); } diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index 3fb8052..8c647d8 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -1,6 +1,6 @@ {locale path="../i18n" domain="Alltube"} - + @@ -10,6 +10,7 @@ {/if} + AllTube Download{if isset($title)} - {$title|escape}{/if} diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index a978372..71f24d2 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -6,8 +6,8 @@
From 433a580d64768e426a8147427999a33d50cf3574 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 23:41:26 +0200 Subject: [PATCH 18/37] Fix LocaleMiddleware tests --- classes/LocaleMiddleware.php | 6 +++--- tests/LocaleMiddlewareTest.php | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/classes/LocaleMiddleware.php b/classes/LocaleMiddleware.php index 42f3515..8084ea8 100644 --- a/classes/LocaleMiddleware.php +++ b/classes/LocaleMiddleware.php @@ -40,7 +40,7 @@ class LocaleMiddleware && $parsedLocale[1]['language'] == $proposedLocale['language'] && $parsedLocale[1]['region'] == $proposedLocale['region'] ) { - return $proposedLocale['language'].'_'.$proposedLocale['region']; + return new Locale($proposedLocale['language'].'_'.$proposedLocale['region']); } } } @@ -61,10 +61,10 @@ class LocaleMiddleware if (!isset($curLocale)) { if (isset($headers[0])) { $this->locale->setLocale( - AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0]) + AcceptLanguage::detect([$this, 'testLocale'], new Locale('en_US'), $headers[0]) ); } else { - $this->locale->setLocale('en_US'); + $this->locale->setLocale(new Locale('en_US')); } } diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php index de54aee..275ff39 100644 --- a/tests/LocaleMiddlewareTest.php +++ b/tests/LocaleMiddlewareTest.php @@ -5,7 +5,9 @@ namespace Alltube\Test; +use Alltube\LocaleManager; use Alltube\LocaleMiddleware; +use Slim\Container; use Slim\Http\Environment; use Slim\Http\Request; use Slim\Http\Response; @@ -28,7 +30,9 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->locale = getenv('LANG'); - $this->middleware = new LocaleMiddleware(); + $container = new Container(); + $container['locale'] = new LocaleManager(); + $this->middleware = new LocaleMiddleware($container); } /** @@ -88,4 +92,22 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase $this->assertEquals('fr_FR', getenv('LANG')); $this->assertEquals('fr_FR', setlocale(LC_ALL, null)); } + + /** + * Test the __invoke() function withot the Accept-Language header. + * + * @return void + */ + public function testInvokeWithoutHeader() + { + $request = Request::createFromEnvironment(Environment::mock()); + $this->middleware->__invoke( + $request->withoutHeader('Accept-Language'), + new Response(), + function () { + } + ); + $this->assertEquals('en_US', getenv('LANG')); + $this->assertEquals('en_US', setlocale(LC_ALL, null)); + } } From 3ead8dd4587a5db019c637c8a1f5389beaa9db40 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 23:49:38 +0200 Subject: [PATCH 19/37] Undeclared properties --- classes/LocaleManager.php | 7 +++++++ classes/LocaleMiddleware.php | 18 +++++++++++++----- controllers/FrontController.php | 23 +++++++++++++++-------- tests/LocaleMiddlewareTest.php | 15 +++++++++++---- 4 files changed, 46 insertions(+), 17 deletions(-) diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php index d031dcc..60d799b 100644 --- a/classes/LocaleManager.php +++ b/classes/LocaleManager.php @@ -24,6 +24,13 @@ class LocaleManager */ private $curLocale; + /** + * Session segment used to store session variables. + * + * @var \Aura\Session\Segment + */ + private $sessionSegment; + /** * LocaleManager constructor. * diff --git a/classes/LocaleMiddleware.php b/classes/LocaleMiddleware.php index 8084ea8..146c4b4 100644 --- a/classes/LocaleMiddleware.php +++ b/classes/LocaleMiddleware.php @@ -15,6 +15,14 @@ use Teto\HTTP\AcceptLanguage; */ class LocaleMiddleware { + + /** + * LocaleManager instance. + * + * @var LocaleManager + */ + private $localeManager; + /** * LocaleMiddleware constructor. * @@ -22,7 +30,7 @@ class LocaleMiddleware */ public function __construct(ContainerInterface $container) { - $this->locale = $container->get('locale'); + $this->localeManager = $container->get('locale'); } /** @@ -34,7 +42,7 @@ class LocaleMiddleware */ public function testLocale(array $proposedLocale) { - foreach ($this->locale->getSupportedLocales() as $locale) { + foreach ($this->localeManager->getSupportedLocales() as $locale) { $parsedLocale = AcceptLanguage::parse($locale); if (isset($proposedLocale['language']) && $parsedLocale[1]['language'] == $proposedLocale['language'] @@ -57,14 +65,14 @@ class LocaleMiddleware public function __invoke(Request $request, Response $response, callable $next) { $headers = $request->getHeader('Accept-Language'); - $curLocale = $this->locale->getLocale(); + $curLocale = $this->localeManager->getLocale(); if (!isset($curLocale)) { if (isset($headers[0])) { - $this->locale->setLocale( + $this->localeManager->setLocale( AcceptLanguage::detect([$this, 'testLocale'], new Locale('en_US'), $headers[0]) ); } else { - $this->locale->setLocale(new Locale('en_US')); + $this->localeManager->setLocale(new Locale('en_US')); } } diff --git a/controllers/FrontController.php b/controllers/FrontController.php index fb5de9f..82eb827 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -62,6 +62,13 @@ class FrontController */ private $defaultFormat = 'best[protocol^=http]'; + /** + * LocaleManager instance. + * + * @var LocaleManager + */ + private $localeManager; + /** * FrontController constructor. * @@ -79,7 +86,7 @@ class FrontController $this->download = new VideoDownload(); $this->container = $container; $this->view = $this->container->get('view'); - $this->locale = $this->container->get('locale'); + $this->localeManager = $this->container->get('locale'); $session_factory = new \Aura\Session\SessionFactory(); $session = $session_factory->newInstance($cookies); $this->sessionSegment = $session->getSegment('Alltube\Controller\FrontController'); @@ -108,8 +115,8 @@ class FrontController 'description' => 'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.', 'domain' => $uri->getScheme().'://'.$uri->getAuthority(), 'canonical' => $this->getCanonicalUrl($request), - 'locales' => $this->locale->getSupportedLocales(), - 'locale' => $this->locale->getLocale(), + 'locales' => $this->localeManager->getSupportedLocales(), + 'locale' => $this->localeManager->getLocale(), ] ); @@ -127,7 +134,7 @@ class FrontController */ public function locale(Request $request, Response $response, array $data) { - $this->locale->setLocale(new Locale($data['locale'])); + $this->localeManager->setLocale(new Locale($data['locale'])); return $response->withRedirect($this->container->get('router')->pathFor('index')); } @@ -152,7 +159,7 @@ class FrontController 'description' => 'List of all supported websites from which Alltube Download '. 'can extract video or audio files', 'canonical' => $this->getCanonicalUrl($request), - 'locale' => $this->locale->getLocale(), + 'locale' => $this->localeManager->getLocale(), ] ); @@ -177,7 +184,7 @@ class FrontController 'title' => 'Password prompt', 'description' => 'You need a password in order to download this video with Alltube Download', 'canonical' => $this->getCanonicalUrl($request), - 'locale' => $this->locale->getLocale(), + 'locale' => $this->localeManager->getLocale(), ] ); @@ -268,7 +275,7 @@ class FrontController 'protocol' => $protocol, 'config' => $this->config, 'canonical' => $this->getCanonicalUrl($request), - 'locale' => $this->locale->getLocale(), + 'locale' => $this->localeManager->getLocale(), ] ); @@ -320,7 +327,7 @@ class FrontController 'class' => 'video', 'title' => 'Error', 'canonical' => $this->getCanonicalUrl($request), - 'locale' => $this->locale->getLocale(), + 'locale' => $this->localeManager->getLocale(), ] ); diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php index 275ff39..2b5352d 100644 --- a/tests/LocaleMiddlewareTest.php +++ b/tests/LocaleMiddlewareTest.php @@ -22,14 +22,21 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase * * @var string */ - private $locale; + private $origlocale; + + /** + * LocaleMiddleware instance. + * + * @var LocaleMiddleware + */ + private $middleware; /** * Prepare tests. */ protected function setUp() { - $this->locale = getenv('LANG'); + $this->origlocale = getenv('LANG'); $container = new Container(); $container['locale'] = new LocaleManager(); $this->middleware = new LocaleMiddleware($container); @@ -42,8 +49,8 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase */ protected function tearDown() { - putenv('LANG='.$this->locale); - setlocale(LC_ALL, $this->locale); + putenv('LANG='.$this->origlocale); + setlocale(LC_ALL, $this->origlocale); } /** From 90dc6f44780a6515681a793bf0892afdcdf4e044 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 23:49:49 +0200 Subject: [PATCH 20/37] Display each locale in its own language --- classes/Locale.php | 6 ++---- templates/inc/header.tpl | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/classes/Locale.php b/classes/Locale.php index 72e84e6..081e215 100644 --- a/classes/Locale.php +++ b/classes/Locale.php @@ -51,13 +51,11 @@ class Locale /** * Get the full name of the locale. * - * @param Locale $displayLocale Locale to get the name in - * * @return string */ - public function getFullName(Locale $displayLocale) + public function getFullName() { - return \Locale::getDisplayName($this->getIso15897(), $displayLocale->getIso15897()); + return \Locale::getDisplayName($this->getIso15897(), $this->getIso15897()); } /** diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 71f24d2..fe57900 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -7,7 +7,7 @@ From dcface77759d14a031b36eb3e0847a9336fa7191 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 23:50:42 +0200 Subject: [PATCH 21/37] Lint --- classes/LocaleMiddleware.php | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/LocaleMiddleware.php b/classes/LocaleMiddleware.php index 146c4b4..51dfe6e 100644 --- a/classes/LocaleMiddleware.php +++ b/classes/LocaleMiddleware.php @@ -15,7 +15,6 @@ use Teto\HTTP\AcceptLanguage; */ class LocaleMiddleware { - /** * LocaleManager instance. * From 6087e90b676a0200a910aaf7a920f57b51c67b03 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 23:55:11 +0200 Subject: [PATCH 22/37] Remove empty
    --- templates/inc/header.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index fe57900..275c0d7 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -4,12 +4,12 @@ {t}Share on Twitter{/t}
- + {/if}
From 4aba4d5bfdc6d259e569f69a3647b263fb09dbd9 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 30 May 2017 23:59:15 +0200 Subject: [PATCH 23/37] Remove tests with getenv() since it does not seem to be reliable across different testing environments --- tests/LocaleMiddlewareTest.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php index 2b5352d..89d3b35 100644 --- a/tests/LocaleMiddlewareTest.php +++ b/tests/LocaleMiddlewareTest.php @@ -96,8 +96,6 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase function () { } ); - $this->assertEquals('fr_FR', getenv('LANG')); - $this->assertEquals('fr_FR', setlocale(LC_ALL, null)); } /** @@ -114,7 +112,10 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase function () { } ); - $this->assertEquals('en_US', getenv('LANG')); - $this->assertEquals('en_US', setlocale(LC_ALL, null)); + } + + public function testEnv() + { + $this->markTestIncomplete('We need to find a way to reliably test LC_ALL and LANG values'); } } From 419110f764efcfc4d07215b33a41ca572a659892 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 00:07:34 +0200 Subject: [PATCH 24/37] Fix FrontController tests --- templates/inc/head.tpl | 2 +- tests/FrontControllerTest.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index 8c647d8..f10d1ff 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -1,6 +1,6 @@ {locale path="../i18n" domain="Alltube"} - + diff --git a/tests/FrontControllerTest.php b/tests/FrontControllerTest.php index 81e75b3..84c4660 100644 --- a/tests/FrontControllerTest.php +++ b/tests/FrontControllerTest.php @@ -7,6 +7,7 @@ namespace Alltube\Test; use Alltube\Config; use Alltube\Controller\FrontController; +use Alltube\LocaleManager; use Alltube\ViewFactory; use Slim\Container; use Slim\Http\Environment; @@ -55,6 +56,7 @@ class FrontControllerTest extends \PHPUnit_Framework_TestCase $this->request = Request::createFromEnvironment(Environment::mock()); $this->response = new Response(); $this->container['view'] = ViewFactory::create($this->container, $this->request); + $this->container['locale'] = new LocaleManager(); $this->controller = new FrontController($this->container, Config::getInstance('config/config_test.yml')); $this->container['router']->map(['GET'], '/', [$this->controller, 'index']) ->setName('index'); @@ -64,6 +66,8 @@ class FrontControllerTest extends \PHPUnit_Framework_TestCase ->setName('extractors'); $this->container['router']->map(['GET'], '/redirect', [$this->controller, 'redirect']) ->setName('redirect'); + $this->container['router']->map(['GET'], '/locale', [$this->controller, 'locale']) + ->setName('locale'); } /** From 0a66dce2b89525c869499d9702c99d617f089e9e Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 00:48:50 +0200 Subject: [PATCH 25/37] More test coverage Run youtube-dl with --restrict-filenames in order to avoid issues when testing against different locales --- classes/Config.php | 2 +- tests/FrontControllerTest.php | 16 +++++++ tests/LocaleManagerTest.php | 65 ++++++++++++++++++++++++++++ tests/LocaleMiddlewareTest.php | 24 +++-------- tests/LocaleTest.php | 79 ++++++++++++++++++++++++++++++++++ tests/VideoDownloadTest.php | 18 ++++---- tests/ViewFactoryTest.php | 15 +++++++ 7 files changed, 190 insertions(+), 29 deletions(-) create mode 100644 tests/LocaleManagerTest.php create mode 100644 tests/LocaleTest.php diff --git a/classes/Config.php b/classes/Config.php index 306c28e..6226f26 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -38,7 +38,7 @@ class Config * * @var array */ - public $params = ['--no-warnings', '--ignore-errors', '--flat-playlist']; + public $params = ['--no-warnings', '--ignore-errors', '--flat-playlist', '--restrict-filenames']; /** * Enable audio conversion. diff --git a/tests/FrontControllerTest.php b/tests/FrontControllerTest.php index 84c4660..c61273a 100644 --- a/tests/FrontControllerTest.php +++ b/tests/FrontControllerTest.php @@ -485,4 +485,20 @@ class FrontControllerTest extends \PHPUnit_Framework_TestCase new Config(['stream'=>true]) ); } + + /** + * Test the locale() function. + * + * @return void + */ + public function testLocale() + { + $this->assertTrue( + $this->controller->locale( + $this->request, + $this->response, + ['locale'=>'fr_FR'] + )->isRedirect() + ); + } } diff --git a/tests/LocaleManagerTest.php b/tests/LocaleManagerTest.php new file mode 100644 index 0000000..073b9a5 --- /dev/null +++ b/tests/LocaleManagerTest.php @@ -0,0 +1,65 @@ +localeManager = new LocaleManager(); + } + + /** + * Test the getSupportedLocales function. + * + * @return void + */ + public function testGetSupportedLocales() + { + foreach ($this->localeManager->getSupportedLocales() as $locale) { + $this->assertInstanceOf(Locale::class, $locale); + } + } + + /** + * Test the getLocale function. + * + * @return void + */ + public function testGetLocale() + { + $this->assertNull($this->localeManager->getLocale()); + } + + /** + * Test the setLocale function. + * + * @return void + */ + public function testSetLocale() + { + $this->localeManager->setLocale(new Locale('foo_BAR')); + $locale = $this->localeManager->getLocale(); + $this->assertInstanceOf(Locale::class, $locale); + $this->assertEquals('foo_BAR', (string) $locale); + } +} diff --git a/tests/LocaleMiddlewareTest.php b/tests/LocaleMiddlewareTest.php index 89d3b35..9aeb3e2 100644 --- a/tests/LocaleMiddlewareTest.php +++ b/tests/LocaleMiddlewareTest.php @@ -17,13 +17,6 @@ use Slim\Http\Response; */ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase { - /** - * Original locale. - * - * @var string - */ - private $origlocale; - /** * LocaleMiddleware instance. * @@ -36,23 +29,11 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->origlocale = getenv('LANG'); $container = new Container(); $container['locale'] = new LocaleManager(); $this->middleware = new LocaleMiddleware($container); } - /** - * Restore environment after the tests. - * - * @return void - */ - protected function tearDown() - { - putenv('LANG='.$this->origlocale); - setlocale(LC_ALL, $this->origlocale); - } - /** * Test the testLocale() function. * @@ -114,6 +95,11 @@ class LocaleMiddlewareTest extends \PHPUnit_Framework_TestCase ); } + /** + * Test that the environment is correctly set up. + * + * @return void + */ public function testEnv() { $this->markTestIncomplete('We need to find a way to reliably test LC_ALL and LANG values'); diff --git a/tests/LocaleTest.php b/tests/LocaleTest.php new file mode 100644 index 0000000..9581248 --- /dev/null +++ b/tests/LocaleTest.php @@ -0,0 +1,79 @@ +locale = new Locale('fr_FR'); + } + + /** + * Test the __toString function. + * + * @return void + */ + public function testGetToString() + { + $this->assertEquals('fr_FR', $this->locale->__toString()); + } + + /** + * Test the getFullName function. + * + * @return void + */ + public function testGetFullName() + { + $this->assertEquals('français (France)', $this->locale->getFullName()); + } + + /** + * Test the getIso15897 function. + * + * @return void + */ + public function testGetIso15897() + { + $this->assertEquals('fr_FR', $this->locale->getIso15897()); + } + + /** + * Test the getBcp47 function. + * + * @return void + */ + public function testGetBcp47() + { + $this->assertEquals('fr-FR', $this->locale->getBcp47()); + } + + /** + * Test the getIso3166 function. + * + * @return void + */ + public function testGetIso3166() + { + $this->assertEquals('fr', $this->locale->getIso3166()); + } +} diff --git a/tests/VideoDownloadTest.php b/tests/VideoDownloadTest.php index 8167b89..8ad006d 100644 --- a/tests/VideoDownloadTest.php +++ b/tests/VideoDownloadTest.php @@ -151,32 +151,32 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase return [ [ 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'best[protocol^=http]', - "It's Not Me, It's You - Hearts Under Fire-M7IpKCZ47pU", + "It_s_Not_Me_It_s_You_-_Hearts_Under_Fire-M7IpKCZ47pU", 'mp4', 'googlevideo.com', ], [ 'https://www.youtube.com/watch?v=RJJ6FCAXvKg', 22, - "'Heart Attack' - Demi Lovato ". - '(Sam Tsui & Against The Current)-RJJ6FCAXvKg', + "Heart_Attack_-_Demi_Lovato_". + 'Sam_Tsui_Against_The_Current-RJJ6FCAXvKg', 'mp4', 'googlevideo.com', ], [ 'https://vimeo.com/24195442', 'best[protocol^=http]', - 'Carving the Mountains-24195442', + 'Carving_the_Mountains-24195442', 'mp4', 'vimeocdn.com', ], [ 'http://www.bbc.co.uk/programmes/b039g8p7', 'bestaudio/best', - 'Leonard Cohen, Kaleidoscope - BBC Radio 4-b039d07m', + 'Leonard_Cohen_Kaleidoscope_-_BBC_Radio_4-b039d07m', 'flv', 'bbcodspdns.fcod.llnwd.net', ], [ 'http://www.rtl2.de/sendung/grip-das-motormagazin/folge/folge-203-0', 'bestaudio/best', - 'GRIP sucht den Sommerkönig-folge-203-0', + 'GRIP_sucht_den_Sommerkonig-folge-203-0', 'f4v', 'edgefcs.net', ], @@ -193,7 +193,7 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase return [ [ 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'bestvideo+bestaudio', - "It's Not Me, It's You - Hearts Under Fire-M7IpKCZ47pU", + "It_s_Not_Me_It_s_You_-_Hearts_Under_Fire-M7IpKCZ47pU", 'mp4', 'googlevideo.com', ], @@ -210,7 +210,7 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase return [ [ 'https://twitter.com/verge/status/813055465324056576/video/1', 'best', - 'The Verge - This tiny origami robot can self-fold and complete tasks-813055465324056576', + 'The_Verge_-_This_tiny_origami_robot_can_self-fold_and_complete_tasks-813055465324056576', 'mp4', 'video.twimg.com', ], @@ -227,7 +227,7 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase return [ [ 'http://www.canalc2.tv/video/12163', 'rtmp', - 'Terrasses du Numérique-12163', + 'Terrasses_du_Numerique-12163', 'flv', 'vod-flash.u-strasbg.fr', ], diff --git a/tests/ViewFactoryTest.php b/tests/ViewFactoryTest.php index 9155faa..b173b97 100644 --- a/tests/ViewFactoryTest.php +++ b/tests/ViewFactoryTest.php @@ -7,6 +7,8 @@ namespace Alltube\Test; use Alltube\ViewFactory; use Slim\Container; +use Slim\Http\Environment; +use Slim\Http\Request; use Slim\Views\Smarty; /** @@ -24,4 +26,17 @@ class ViewFactoryTest extends \PHPUnit_Framework_TestCase $view = ViewFactory::create(new Container()); $this->assertInstanceOf(Smarty::class, $view); } + + + /** + * Test the create() function with a X-Forwarded-Proto header. + * + * @return void + */ + public function testCreateWithXForwardedProto() + { + $request = Request::createFromEnvironment(Environment::mock()); + $view = ViewFactory::create(new Container(), $request->withHeader('X-Forwarded-Proto', 'https')); + $this->assertInstanceOf(Smarty::class, $view); + } } From 68525c9dd8c3153a56ade7f5e66459ffc1c9ae37 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 00:51:11 +0200 Subject: [PATCH 26/37] We don't need to call sessionSegment->get() twice --- classes/LocaleManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php index 60d799b..d822588 100644 --- a/classes/LocaleManager.php +++ b/classes/LocaleManager.php @@ -43,7 +43,7 @@ class LocaleManager $this->sessionSegment = $session->getSegment('Alltube\LocaleManager'); $cookieLocale = $this->sessionSegment->get('locale'); if (isset($cookieLocale)) { - $this->setLocale(new Locale($this->sessionSegment->get('locale'))); + $this->setLocale(new Locale($cookieLocale)); } } From 788e6e93b1dc12e7d663d80f66a67dd22e6e7b3d Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 00:56:53 +0200 Subject: [PATCH 27/37] Fake LocaleManager session in test --- tests/LocaleManagerTest.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/LocaleManagerTest.php b/tests/LocaleManagerTest.php index 073b9a5..693346f 100644 --- a/tests/LocaleManagerTest.php +++ b/tests/LocaleManagerTest.php @@ -28,6 +28,18 @@ class LocaleManagerTest extends \PHPUnit_Framework_TestCase $this->localeManager = new LocaleManager(); } + /** + * Test the getSupportedLocales function. + * + * @return void + */ + public function testConstructorWithCookies() + { + $_SESSION['Alltube\LocaleManager']['locale'] = 'foo_BAR'; + $localeManager = new LocaleManager([]); + $this->assertEquals('foo_BAR', (string) $localeManager->getLocale()); + } + /** * Test the getSupportedLocales function. * From 4ee72d1629a1a53c20fdbae241dc3866056b8790 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 00:57:39 +0200 Subject: [PATCH 28/37] Lint --- tests/FrontControllerTest.php | 2 +- tests/VideoDownloadTest.php | 6 +++--- tests/ViewFactoryTest.php | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/FrontControllerTest.php b/tests/FrontControllerTest.php index c61273a..6716cbc 100644 --- a/tests/FrontControllerTest.php +++ b/tests/FrontControllerTest.php @@ -497,7 +497,7 @@ class FrontControllerTest extends \PHPUnit_Framework_TestCase $this->controller->locale( $this->request, $this->response, - ['locale'=>'fr_FR'] + ['locale'=> 'fr_FR'] )->isRedirect() ); } diff --git a/tests/VideoDownloadTest.php b/tests/VideoDownloadTest.php index 8ad006d..ab3fa7d 100644 --- a/tests/VideoDownloadTest.php +++ b/tests/VideoDownloadTest.php @@ -151,13 +151,13 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase return [ [ 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'best[protocol^=http]', - "It_s_Not_Me_It_s_You_-_Hearts_Under_Fire-M7IpKCZ47pU", + 'It_s_Not_Me_It_s_You_-_Hearts_Under_Fire-M7IpKCZ47pU', 'mp4', 'googlevideo.com', ], [ 'https://www.youtube.com/watch?v=RJJ6FCAXvKg', 22, - "Heart_Attack_-_Demi_Lovato_". + 'Heart_Attack_-_Demi_Lovato_'. 'Sam_Tsui_Against_The_Current-RJJ6FCAXvKg', 'mp4', 'googlevideo.com', @@ -193,7 +193,7 @@ class VideoDownloadTest extends \PHPUnit_Framework_TestCase return [ [ 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'bestvideo+bestaudio', - "It_s_Not_Me_It_s_You_-_Hearts_Under_Fire-M7IpKCZ47pU", + 'It_s_Not_Me_It_s_You_-_Hearts_Under_Fire-M7IpKCZ47pU', 'mp4', 'googlevideo.com', ], diff --git a/tests/ViewFactoryTest.php b/tests/ViewFactoryTest.php index b173b97..552ed9f 100644 --- a/tests/ViewFactoryTest.php +++ b/tests/ViewFactoryTest.php @@ -27,7 +27,6 @@ class ViewFactoryTest extends \PHPUnit_Framework_TestCase $this->assertInstanceOf(Smarty::class, $view); } - /** * Test the create() function with a X-Forwarded-Proto header. * From a2dc71753ef250edade07a0bd68b19759f536c1f Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 09:32:11 +0200 Subject: [PATCH 29/37] Rename Smarty variable to avoid confusion --- controllers/FrontController.php | 14 +++++++------- templates/inc/header.tpl | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/controllers/FrontController.php b/controllers/FrontController.php index 82eb827..3318048 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -110,13 +110,13 @@ class FrontController $response, 'index.tpl', [ - 'config' => $this->config, - 'class' => 'index', - 'description' => 'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.', - 'domain' => $uri->getScheme().'://'.$uri->getAuthority(), - 'canonical' => $this->getCanonicalUrl($request), - 'locales' => $this->localeManager->getSupportedLocales(), - 'locale' => $this->localeManager->getLocale(), + 'config' => $this->config, + 'class' => 'index', + 'description' => 'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.', + 'domain' => $uri->getScheme().'://'.$uri->getAuthority(), + 'canonical' => $this->getCanonicalUrl($request), + 'supportedLocales' => $this->localeManager->getSupportedLocales(), + 'locale' => $this->localeManager->getLocale(), ] ); diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 275c0d7..92066b5 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -4,9 +4,9 @@ {t}Share on Twitter{/t}
- {if isset($locales)} + {if isset($supportedLocales)} From 0c4b055cf9e4dce41780da396b6a57c09802a7b0 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 11:47:33 +0200 Subject: [PATCH 30/37] Update package-lock.json --- package-lock.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/package-lock.json b/package-lock.json index b3526d0..1c2c917 100644 --- a/package-lock.json +++ b/package-lock.json @@ -676,6 +676,11 @@ "integrity": "sha1-DnW+5rXC5l/aRQdWcqBs6yzs2Gk=", "dev": true }, + "grunt-potomo": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/grunt-potomo/-/grunt-potomo-3.5.0.tgz", + "integrity": "sha1-WtjG9+djrVtRg55cbTI1gGLHN5U=" + }, "gzip-size": { "version": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=" @@ -770,6 +775,11 @@ "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", "dev": true }, + "interpret": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=" + }, "is-arrayish": { "version": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" @@ -1236,6 +1246,11 @@ "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=" }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=" + }, "redent": { "version": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=" @@ -1288,6 +1303,11 @@ "dev": true, "optional": true }, + "shelljs": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz", + "integrity": "sha1-svXHfvlxSPS09uImguELuoZnz/E=" + }, "signal-exit": { "version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" From 2add291023d5e10c78679e4ffe3d575ec1f4c340 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 16:26:00 +0200 Subject: [PATCH 31/37] Use emoji instead of SVG flags --- bower.json | 3 +- classes/Locale.php | 5 ++ composer.json | 3 +- composer.lock | 106 +++++++++++++++++++++++++++++++++------ templates/inc/head.tpl | 1 - templates/inc/header.tpl | 2 +- 6 files changed, 99 insertions(+), 21 deletions(-) diff --git a/bower.json b/bower.json index 10794c7..8c7ffdb 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,6 @@ { "name": "alltube", "dependencies": { - "opensans-googlefont": "*", - "flag-icon-css": "~2.8.0" + "opensans-googlefont": "*" } } diff --git a/classes/Locale.php b/classes/Locale.php index 081e215..cf6f602 100644 --- a/classes/Locale.php +++ b/classes/Locale.php @@ -87,4 +87,9 @@ class Locale { return strtolower($this->region); } + + public function getCountry() + { + return country($this->getIso3166()); + } } diff --git a/composer.json b/composer.json index e977748..310215c 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "aura/session": "~2.1.0", "barracudanetworks/archivestream-php": "~1.0.5", "smarty-gettext/smarty-gettext": "~1.5.1", - "zonuexe/http-accept-language": "~0.4.1" + "zonuexe/http-accept-language": "~0.4.1", + "rinvex/country": "~2.0.0" }, "require-dev": { "symfony/var-dumper": "~3.2.0", diff --git a/composer.lock b/composer.lock index a4ac43a..c5368cc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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" ], - "content-hash": "44c4a3592a8eac7111a7284b22e55868", + "content-hash": "22e16312bcf339c90850660d9e5923e7", "packages": [ { "name": "aura/session", @@ -591,6 +591,80 @@ "description": "Add ability to chain symfony processes", "time": "2016-04-10T08:33:20+00:00" }, + { + "name": "rinvex/country", + "version": "v2.0.0", + "source": { + "type": "git", + "url": "https://github.com/rinvex/country.git", + "reference": "9405da035644bc76671bfba0c282fef8fd3408e1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rinvex/country/zipball/9405da035644bc76671bfba0c282fef8fd3408e1", + "reference": "9405da035644bc76671bfba0c282fef8fd3408e1", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "phpunit/phpunit": "^5.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Rinvex\\Country\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rinvex LLC", + "email": "help@rinvex.com", + "homepage": "https://rinvex.com" + }, + { + "name": "Abdelrahman Omran", + "email": "me@omranic.com", + "homepage": "https://omranic.com", + "role": "Project Lead" + }, + { + "name": "The Generous Laravel Community", + "homepage": "https://github.com/rinvex/country/contributors" + } + ], + "description": "Rinvex Country is a simple and lightweight package for retrieving country details with flexibility. A whole bunch of data including name, demonym, capital, iso codes, dialling codes, geo data, currencies, flags, emoji, and other attributes for all 250 countries worldwide at your fingertips.", + "homepage": "https://rinvex.com", + "keywords": [ + "Flexible", + "Simple", + "countries", + "country", + "currencies", + "demonym", + "dialling", + "emoji", + "flags", + "geographic", + "languages", + "rinvex", + "svg" + ], + "time": "2016-11-27T05:53:11+00:00" + }, { "name": "slim/slim", "version": "3.8.1", @@ -771,16 +845,16 @@ }, { "name": "symfony/process", - "version": "v3.2.8", + "version": "v3.2.9", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0" + "reference": "36774717bbd1631be2d0a45acf48aecd5836c867" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", - "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", + "url": "https://api.github.com/repos/symfony/process/zipball/36774717bbd1631be2d0a45acf48aecd5836c867", + "reference": "36774717bbd1631be2d0a45acf48aecd5836c867", "shasum": "" }, "require": { @@ -816,20 +890,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-05-08T01:51:21+00:00" }, { "name": "symfony/yaml", - "version": "v3.2.8", + "version": "v3.2.9", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6" + "reference": "4cdb9fec28fba88203a71f6d095018867f7a2065" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/acec26fcf7f3031e094e910b94b002fa53d4e4d6", - "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6", + "url": "https://api.github.com/repos/symfony/yaml/zipball/4cdb9fec28fba88203a71f6d095018867f7a2065", + "reference": "4cdb9fec28fba88203a71f6d095018867f7a2065", "shasum": "" }, "require": { @@ -871,7 +945,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-25T23:42:36+00:00" }, { "name": "zonuexe/http-accept-language", @@ -2333,16 +2407,16 @@ }, { "name": "symfony/var-dumper", - "version": "v3.2.8", + "version": "v3.2.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "fa47963ac7979ddbd42b2d646d1b056bddbf7bb8" + "reference": "eda0d0891a0b60a25015f7b85ea8040b51d72e1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/fa47963ac7979ddbd42b2d646d1b056bddbf7bb8", - "reference": "fa47963ac7979ddbd42b2d646d1b056bddbf7bb8", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eda0d0891a0b60a25015f7b85ea8040b51d72e1e", + "reference": "eda0d0891a0b60a25015f7b85ea8040b51d72e1e", "shasum": "" }, "require": { @@ -2397,7 +2471,7 @@ "debug", "dump" ], - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-15T12:02:31+00:00" }, { "name": "webmozart/assert", diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index f10d1ff..16e185f 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -10,7 +10,6 @@ {/if} - AllTube Download{if isset($title)} - {$title|escape}{/if} diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 92066b5..688f9a7 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -7,7 +7,7 @@ {if isset($supportedLocales)} {/if} From 6905877e36f555f5f983611fcb7aaf03ddb17aef Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 31 May 2017 16:35:37 +0200 Subject: [PATCH 32/37] Use lang attributes in locale switcher --- templates/inc/header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 688f9a7..cf36d8b 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -7,7 +7,7 @@ {if isset($supportedLocales)} {/if} From bbee27caa91c8296417ea1b8e4df64a58b379a96 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Thu, 1 Jun 2017 01:04:39 +0200 Subject: [PATCH 33/37] Language switcher CSS --- css/style.css | 44 ++++++++++++++++++++++++++++++++++++++++ templates/inc/header.tpl | 9 ++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 42b1bc9..6a1f06e 100644 --- a/css/style.css +++ b/css/style.css @@ -598,6 +598,50 @@ h1 { .locales { float: left; text-align: left; + padding-left: 1em; + padding-top: 1em; + font-size: 12px; +} + +.locales a, +.locales a:visited { + text-decoration: none; + color: #737881; +} + +.supportedLocales { + display: none; + list-style-type: none; + padding-left: 0; + background-color: #f5f5f6; + margin: 0; +} + +.supportedLocales li { + border-bottom: thin solid #ebebeb; +} + +.supportedLocales li a { + padding: 1em; + padding-right: 2em; + display: block; +} + +.supportedLocales li:hover { + background-color: #ECECEC; +} + +.localesBtn { + padding: 1em; + display: inline-block; +} + +.localesBtn:focus { + background-color: rgb(245, 245, 246); +} + +.localesBtn:focus + .supportedLocales { + display: block; } @media (max-width: 640px) { diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index cf36d8b..4792f8a 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -5,11 +5,16 @@
{if isset($supportedLocales)} -
    +
    + {$locale->getCountry()->getEmoji()} + {/if} +
    From 393255180cdf7d5a4fd15e28522827eabcbfa02f Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Thu, 1 Jun 2017 01:38:35 +0200 Subject: [PATCH 34/37] csslint --- Gruntfile.js | 8 +- css/style.css | 671 ++++++++++++++++++++++++-------------------------- package.json | 1 + 3 files changed, 334 insertions(+), 346 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 050b970..aa1a811 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -101,6 +101,11 @@ module.exports = function (grunt) { 'i18n/zh_CN/LC_MESSAGES/Alltube.mo': 'i18n/zh_CN/LC_MESSAGES/Alltube.po' } } + }, + csslint: { + css: { + src: 'css/*' + } } } ); @@ -117,9 +122,10 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-jsonlint'); grunt.loadNpmTasks('grunt-fixpack'); grunt.loadNpmTasks('grunt-potomo'); + grunt.loadNpmTasks('grunt-contrib-csslint'); grunt.registerTask('default', ['uglify', 'cssmin', 'potomo']); - grunt.registerTask('lint', ['jslint', 'fixpack', 'jsonlint', 'phpcs']); + grunt.registerTask('lint', ['jslint', 'csslint', 'fixpack', 'jsonlint', 'phpcs']); grunt.registerTask('test', ['phpunit']); grunt.registerTask('doc', ['phpdocumentor']); grunt.registerTask('release', ['default', 'githash', 'compress']); diff --git a/css/style.css b/css/style.css index 6a1f06e..b7f9b7d 100644 --- a/css/style.css +++ b/css/style.css @@ -1,10 +1,10 @@ body { - text-align:center; background-color: #EBEBEB; background-image:url('../img/fond.jpg'); font-family: 'Open Sans', sans-serif; font-weight:400; + text-align:center; } @@ -12,90 +12,90 @@ body { /************************HEADER******************************/ header { - position:absolute; - top:0; - text-align:right; - width:100%; padding:0; - } + position:absolute; + text-align:right; + top:0; + width:100%; +} -.social -{padding-right:21px;} +.social { + padding-right:21px; +} -header .social a -{ -overflow:hidden; -height:38px; -width:38px; -position:relative; -float:right; -margin-top:13px; -margin-left:13px; -margin-right:0; -background-position:0 0; -background-repeat:no-repeat; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; +header .social a { + background-position:0 0; + background-repeat:no-repeat; + float:right; + height:38px; + margin-left:13px; + margin-right:0; + margin-top:13px; + overflow:hidden; + position:relative; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; + width:38px; } header a:focus, -header a:hover -{ - outline:none; +header a:hover { background-position:0 100%; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; + outline:none; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; } -.share -{background-image:url('../img/share.png');} - -.sharemask -{ -height:38px; -width:38px; -position:absolute; -top:0; -left:0; -z-index:10; -background-image:url('../img/sharemask.png'); -background-position:top left; -background-repeat:no-repeat; +.share { + background-image:url('../img/share.png'); } -.facebook -{background-image:url('../img/facebook.png');} +.sharemask { + background-image:url('../img/sharemask.png'); + background-position:top left; + background-repeat:no-repeat; + height:38px; + left:0; + position:absolute; + top:0; + width:38px; + z-index:10; -.facebookmask -{ -height:38px; -width:38px; -position:absolute; -top:0; -left:0; -z-index:10; -background-image:url('../img/facebookmask.png'); -background-position:top left; -background-repeat:no-repeat; } -.twitter -{background-image:url('../img/twitter.png');} +.facebook { + background-image:url('../img/facebook.png'); +} -.twittermask -{ -height:38px; -width:38px; -position:absolute; -top:0; -left:0; -z-index:10; -background-image:url('../img/twittermask.png'); -background-position:top left; -background-repeat:no-repeat; +.facebookmask { + background-image:url('../img/facebookmask.png'); + background-position:top left; + background-repeat:no-repeat; + height:38px; + left:0; + position:absolute; + top:0; + width:38px; + z-index:10; +} + +.twitter { + background-image:url('../img/twitter.png'); +} + +.twittermask { + background-image:url('../img/twittermask.png'); + background-position:top left; + background-repeat:no-repeat; + height:38px; + left:0; + position:absolute; + top:0; + width:38px; + z-index:10; } @@ -104,16 +104,16 @@ background-repeat:no-repeat; footer { - position:fixed; - bottom:0; - text-align:center; - width:100%; background-image:url('../img/fondfooter.png'); - background-repeat:repeat-x; background-position:top left; - padding-top:20px; + background-repeat:repeat-x; + bottom:0; color:#adadad; font-size:12px; + padding-top:20px; + position:fixed; + text-align:center; + width:100%; z-index:11; } @@ -123,20 +123,19 @@ footer { footer a{ color:#adadad; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; - text-decoration:none; + text-decoration:none; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; } footer a:focus, -footer a:hover -{ +footer a:hover { + color:#f2084a; outline:none; -color:#f2084a; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; } @@ -150,46 +149,42 @@ color:#f2084a; padding-bottom:55px; } -.labelurl -{ -position:relative; -color:#3f3f3f; -font-size:19px; - +.labelurl { + color:#3f3f3f; + font-size:19px; + position:relative; } -.champs -{ -position:relative; -margin-bottom:70px; -margin-top:8px; +.champs { + margin-bottom:70px; + margin-top:8px; + position:relative; } .downloadBtn { - position:relative; background-color:#3A3A3A; border: 3px solid #a5a5a5; - color:#dedede; border-radius:10px; - padding: 12px 14px; + color:#dedede; + cursor:pointer; + display:inline-block; font-size:24px; font-weight:800; - cursor:pointer; + padding: 12px 14px; + position:relative; + text-decoration:none; -webkit-transition: all 0.1s ease-in; -moz-transition: all 0.1s ease-in; -o-transition: all 0.1s ease-in; - text-decoration:none; - display:inline-block; } .downloadBtn:focus, -.downloadBtn:hover -{ - outline:none; +.downloadBtn:hover { background-color:#f2084a; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; + outline:none; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; } .downloadBtn::-moz-focus-inner { @@ -197,22 +192,22 @@ margin-top:8px; } .URLinput{ - position:relative; background-color:#fff; border: 3px solid #a5a5a5; - color:#3F3F3F; border-radius:10px; - padding: 12px 12px 12px 12px; - min-width:426px; + color:#3F3F3F; font-size:24px; font-weight:800; margin-right:8px; + min-width:426px; + padding: 12px 12px 12px 12px; + position:relative; } .URLinput:focus { - outline: none; border-color:#3A3A3A; + outline: none; } .URLinput:-webkit-input-placeholder{ @@ -223,176 +218,167 @@ margin-top:8px; } .combatiblelink { -position:relative; -color:#a5a5a5; -font-size:13px; -z-index:10; -text-decoration:none; -background-image:url('../img/compatiblerouage.png'); -background-position:0 100%; -background-repeat:no-repeat; -padding-left:41px; -padding-top:10px; -padding-bottom:10px; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; + background-image:url('../img/compatiblerouage.png'); + background-position:0 100%; + background-repeat:no-repeat; + color:#a5a5a5; + font-size:13px; + padding-bottom:10px; + padding-left:41px; + padding-top:10px; + position:relative; + text-decoration:none; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; + z-index:10; } .combatiblelink:focus, -.combatiblelink:hover -{ +.combatiblelink:hover { + background-position:0 0; + color:#f2084a; outline:none; -background-position:0 0; -color:#f2084a; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; } -#bookmarklet{ -padding:15px; -} - -.bookmarklet{ -position:relative; -font-size:13px; -color:gray; -z-index:10; -text-decoration:none; -padding-left:30px; -padding-right:30px; -padding-top:10px; -padding-bottom:10px; -border: 2px dotted; -} - -.mp3 -{ +.bookmarklet { + border: 2px dotted; + color:gray; + font-size:13px; + padding:10px 30px; position:relative; + text-decoration:none; + z-index:10; +} + +.mp3 { background-color:#cecece; - color:#696969; border-radius:6px; - width:622px; + color:#696969; font-size:14px; + font-weight:300; height:26px; margin-top:12px; + position:relative; text-align:left; - font-weight:300; + width:622px; } -.mp3 p -{ -padding:3px; +.mp3 p { + padding:3px; } - /* - Demo CSS code - */ +.audio:not(:checked), +.audio:checked { + left: -9999px; + position: absolute; +} +.audio:not(:checked) + label, +.audio:checked + label { + cursor: pointer; + line-height:22px; + padding-left: 82px; + position: relative; +} +.audio:not(:checked) + label:before, +.audio:checked + label:before, +.audio:not(:checked) + label:after, +.audio:checked + label:after { + content: ''; + position: absolute; +} +.audio:not(:checked) + label:before, +.audio:checked + label:before { + background: #ffffff; + border-radius: 6px; + height: 20px; + left:0; + top: -1px; + -webkit-transition: background-color .2s; + -moz-transition: background-color .2s; + -ms-transition: background-color .2s; + -o-transition: background-color .2s; + transition: background-color .2s; + width: 45px; +} +.audio:not(:checked) + label:after, +.audio:checked + label:after { + background: #3a3a3a; + border-radius: 6px; + height: 16px; + left: 2px; + top: 1px; + -webkit-transition: all .2s; + -moz-transition: all .2s; + -ms-transition: all .2s; + -o-transition: all .2s; + transition: all .2s; + width: 16px; +} - .audio:not(:checked), - .audio:checked { - position: absolute; - left: -9999px; - } - .audio:not(:checked) + label, - .audio:checked + label { - position: relative; - padding-left: 82px; - cursor: pointer; - line-height:22px; - } - .audio:not(:checked) + label:before, - .audio:checked + label:before, - .audio:not(:checked) + label:after, - .audio:checked + label:after { - content: ''; - position: absolute; - } - .audio:not(:checked) + label:before, - .audio:checked + label:before { - left:0; top: -1px; - width: 45px; height: 20px; - background: #ffffff; - border-radius: 6px; - -webkit-transition: background-color .2s; - -moz-transition: background-color .2s; - -ms-transition: background-color .2s; - -o-transition: background-color .2s; - transition: background-color .2s; - } - .audio:not(:checked) + label:after, - .audio:checked + label:after { - width: 16px; height: 16px; - -webkit-transition: all .2s; - -moz-transition: all .2s; - -ms-transition: all .2s; - -o-transition: all .2s; - transition: all .2s; - border-radius: 6px; - background: #3a3a3a; - top: 1px; left: 2px; - } +.audio:focus + label { + color:black; +} - .audio:focus + label { - color:black; - } +/* on checked */ +.audio:checked + label:before { + background:#f2084a; +} +.audio:checked + label:after { + background: #fff; + left: 27px; + top: 1px; +} - /* on checked */ - .audio:checked + label:before { - background:#f2084a; - } - .audio:checked + label:after { - background: #fff; - top: 1px; left: 27px; - } - - .audio:checked + label .ui, - .audio:not(:checked) + label .ui:before, - .audio:checked + label .ui:after { - position: absolute; - left: 3px; - width: 45px; - border-radius: 15px; - font-size: 11px; - font-weight: bold; - line-height: 17px; - height:20px; - -webkit-transition: all .2s; - -moz-transition: all .2s; - -ms-transition: all .2s; - -o-transition: all .2s; - transition: all .2s; - } - .audio:not(:checked) + label .ui:before { - content: "no"; - left: 0; - padding-left:23px; - padding-top:2px; - background-image:url('../img/mp3hover.png'); - background-repeat:no-repeat; - background-position:right top; - width:56px; - -webkit-transition: all .2s; - -moz-transition: all .2s; - -ms-transition: all .2s; - -o-transition: all .2s; - transition: all .2s; - } - .audio:checked + label .ui:after { - content: "yes"; - color: #fff; - background-image:url('../img/mp3.png'); - background-repeat:no-repeat; - background-position:right top; - width:73px; - -webkit-transition: all .2s; - -moz-transition: all .2s; - -ms-transition: all .2s; - -o-transition: all .2s; - transition: all .2s; - } +.audio:checked + label .ui, +.audio:not(:checked) + label .ui:before, +.audio:checked + label .ui:after { + border-radius: 15px; + font-size: 11px; + font-weight: bold; + height:20px; + left: 3px; + line-height: 17px; + position: absolute; + -webkit-transition: all .2s; + -moz-transition: all .2s; + -ms-transition: all .2s; + -o-transition: all .2s; + transition: all .2s; + width: 45px; +} +.audio:not(:checked) + label .ui:before { + background-image:url('../img/mp3hover.png'); + background-position:right top; + background-repeat:no-repeat; + content: "no"; + left: 0; + padding-left:23px; + padding-top:2px; + -webkit-transition: all .2s; + -moz-transition: all .2s; + -ms-transition: all .2s; + -o-transition: all .2s; + transition: all .2s; + width:56px; +} +.audio:checked + label .ui:after { + background-image:url('../img/mp3.png'); + background-position:right top; + background-repeat:no-repeat; + color: #fff; + content: "yes"; + -webkit-transition: all .2s; + -moz-transition: all .2s; + -ms-transition: all .2s; + -o-transition: all .2s; + transition: all .2s; + width:73px; +} @@ -423,8 +409,8 @@ padding:3px; } .playlist-entry .downloadBtn { - font-size: 16px; border-width: 2px; + font-size: 16px; } @@ -432,98 +418,93 @@ padding:3px; /*************************CONTENT COMPATIBLES****************************/ -.logobis -{ -width:447px; -height:107px; -position:relative; -margin:0 auto 10px auto; +.logobis { + height:107px; + margin:0 auto 10px auto; + position:relative; + width:447px; } -.logocompatible -{ -width:447px; -height:107px; -background-image:url('../img/logocompatible.png'); -background-repeat:repeat-y; -background-position:0 0; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in; -display:block; +.logocompatible { + background-image:url('../img/logocompatible.png'); + background-position:0 0; + background-repeat:repeat-y; + display:block; + height:107px; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; + width:447px; } .logocompatible:focus, .logocompatible:hover { - outline:none; background-position:0 100%; - -webkit-transition: all 0.1s ease-in; - -moz-transition: all 0.1s ease-in; - -o-transition: all 0.1s ease-in;} - - -.logocompatiblemask -{ -z-index:10; -position:absolute; -top:0; -left:0; -width:447px; -height:107px; -background-image:url('../img/logocompatiblemask.png'); -background-position:0 100%; -background-repeat:no-repeat; -} - -.titre -{ -font-family: 'Open Sans', sans-serif; -font-weight:300; -color:#383838; -font-size:48px; -} - -.tripleliste -{ -margin-top:80px; -width:800px; -position:relative; -margin-left:auto; -margin-right:auto; + outline:none; + -webkit-transition: all 0.1s ease-in; + -moz-transition: all 0.1s ease-in; + -o-transition: all 0.1s ease-in; } -.tripleliste ul -{ -margin-bottom:1em; -width:600px; -margin-left:120px;} +.logocompatiblemask { + background-image:url('../img/logocompatiblemask.png'); + background-position:0 100%; + background-repeat:no-repeat; + height:107px; + left:0; + position:absolute; + top:0; + width:447px; + z-index:10; +} -.tripleliste ul li -{text-align:left; -List-Style-Type:none; -color:#383838; -font-size:16px; +.titre { + color:#383838; + font-family: 'Open Sans', sans-serif; + font-size:48px; + font-weight:300; +} -width:200px; -float:left; -position:relative; +.tripleliste { + margin-left:auto; + margin-right:auto; + margin-top:80px; + position:relative; + width:800px; +} + + +.tripleliste ul { + margin-bottom:1em; + margin-left:120px; + width:600px; +} + +.tripleliste ul li { + color:#383838; + float:left; + font-size:16px; + list-style-type:none; + position:relative; + text-align:left; + width:200px; } html, body { - margin:0; height:100%; + margin:0; } .wrapper { - height:100%; - display:table; - margin:auto; - padding-bottom:110px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + display:table; + height:100%; + margin:auto; + padding-bottom:110px; } .main { display:table-cell; @@ -597,24 +578,24 @@ h1 { .locales { float: left; - text-align: left; + font-size: 12px; padding-left: 1em; padding-top: 1em; - font-size: 12px; + text-align: left; } .locales a, .locales a:visited { - text-decoration: none; color: #737881; + text-decoration: none; } .supportedLocales { + background-color: #f5f5f6; display: none; list-style-type: none; - padding-left: 0; - background-color: #f5f5f6; margin: 0; + padding-left: 0; } .supportedLocales li { @@ -622,9 +603,9 @@ h1 { } .supportedLocales li a { + display: block; padding: 1em; padding-right: 2em; - display: block; } .supportedLocales li:hover { @@ -632,8 +613,8 @@ h1 { } .localesBtn { - padding: 1em; display: inline-block; + padding: 1em; } .localesBtn:focus { @@ -668,9 +649,9 @@ h1 { .champs, .URLinput, .mp3 { - width:90%; - margin:auto; height:auto; + margin:auto; + width:90%; } .logo { @@ -678,8 +659,8 @@ h1 { } .logocompatible img { - width:100%; height: auto; + width:100%; } .downloadBtn { @@ -695,9 +676,9 @@ h1 { .tripleliste ul, .tripleliste { - width:auto; margin-left:auto; margin-top:auto; + width:auto; } .logocompatiblemask { @@ -705,9 +686,9 @@ h1 { } .logocompatible { - height:auto; - background-image:none; background-color:#4F4F4F; + background-image:none; + height:auto; } .logocompatiblemask, diff --git a/package.json b/package.json index 14ca609..eb35557 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "dependencies": { "bower": "~1.8.0", "grunt": "~1.0.1", + "grunt-contrib-csslint": "~2.0.0", "grunt-contrib-cssmin": "~2.2.0", "grunt-contrib-uglify": "~3.0.0", "grunt-potomo": "~3.5.0" From 72edcf8f78fc6d87d5e81fe891354e011c8f51d6 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Thu, 1 Jun 2017 10:36:53 +0200 Subject: [PATCH 35/37] Update package-lock.json --- package-lock.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package-lock.json b/package-lock.json index 1c2c917..71c775c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -227,6 +227,11 @@ "version": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.3.tgz", "integrity": "sha1-B8/omA7bINRV3cI6rc8eBMblCc4=" }, + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=" + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -303,6 +308,11 @@ "dev": true, "optional": true }, + "csslint": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz", + "integrity": "sha1-Gcw+2jIhYP0/cjKvHLKjYOiYouk=" + }, "currently-unhandled": { "version": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=" @@ -579,6 +589,23 @@ } } }, + "grunt-contrib-csslint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-csslint/-/grunt-contrib-csslint-2.0.0.tgz", + "integrity": "sha1-MSnZTf5Qc1fyMzfSSunpqkudV98=", + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + } + } + }, "grunt-contrib-cssmin": { "version": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-2.2.0.tgz", "integrity": "sha1-ct70BijujiE62adoBNEx22ZgSkE=" @@ -1149,6 +1176,11 @@ "version": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=" }, + "parserlib": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz", + "integrity": "sha1-pkz6ckBiQ0/fw1HJpOwtkrlMBvQ=" + }, "parseurl": { "version": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=", From f6a04458e7a5e5e6926140fcb6dc1dc240d673f3 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Thu, 1 Jun 2017 10:59:37 +0200 Subject: [PATCH 36/37] Improve language switcher --- css/style.css | 25 ++++++++++++++++++------- templates/inc/header.tpl | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/css/style.css b/css/style.css index b7f9b7d..eefeedb 100644 --- a/css/style.css +++ b/css/style.css @@ -586,20 +586,26 @@ h1 { .locales a, .locales a:visited { - color: #737881; + color: #696969; text-decoration: none; } .supportedLocales { - background-color: #f5f5f6; - display: none; + background-color: #fff; list-style-type: none; margin: 0; + opacity: 0; padding-left: 0; + transition: visibility 0.5s; + visibility: hidden; } .supportedLocales li { - border-bottom: thin solid #ebebeb; + border-bottom: thin solid #E1E1E1; +} + +.supportedLocales li:last-child { + border-bottom: none; } .supportedLocales li a { @@ -609,20 +615,25 @@ h1 { } .supportedLocales li:hover { - background-color: #ECECEC; + background-color: #cecece; } .localesBtn { + border: none; + cursor: pointer; display: inline-block; + font-size: 12px; padding: 1em; } .localesBtn:focus { - background-color: rgb(245, 245, 246); + background-color: #fff; + pointer-events: none; } .localesBtn:focus + .supportedLocales { - display: block; + opacity: 1; + visibility: visible; } @media (max-width: 640px) { diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 4792f8a..06e77a6 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -6,7 +6,7 @@
    {if isset($supportedLocales)}
    - {$locale->getCountry()->getEmoji()} +
      {foreach $supportedLocales as $supportedLocale} {if $supportedLocale != $locale} From c9c3988b91ecf5caf040dade750c05f4c0ac3b3a Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Thu, 1 Jun 2017 11:08:50 +0200 Subject: [PATCH 37/37] Fix tests --- templates/inc/header.tpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 06e77a6..4ae06cd 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -6,7 +6,13 @@
    {if isset($supportedLocales)}
    - +
      {foreach $supportedLocales as $supportedLocale} {if $supportedLocale != $locale}