January 2016 - Wine-commits

Jeremy Newman : use icons from bootstrap for prev/next links
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: cfee2e26691dff8516dfd6d6a15eb8277b4ac4c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=cfee2e26691dff8516dfd6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:54:14 2016 -0600 use icons from bootstrap for prev/next links --- include/plugins/news.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index a42c9fc..e78b0eb 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -7,7 +7,7 @@ */ // language override -if ($_GET['lang'] and in_array($_GET['lang'], $config->languages)) +if (!empty($_GET['lang']) and in_array($_GET['lang'], $config->languages)) $html->lang = $_GET['lang']; // display news based on page params @@ -40,7 +40,7 @@ switch (true) $html->page_title .= " - {$html->meta_og['title']}"; // if link defined, use it in title - if ($vars['link']) + if (!empty($vars['link'])) { $vars['link'] = str_replace("{\$root}", $html->_web_root, $vars['link']); $vars['title'] = '<a href="'.$vars['link'].'">'.$vars['title'].'</a>'; @@ -133,7 +133,7 @@ switch (true) // where are we in news list $x = 0; - if (is_numeric(PAGE_PARAMS)) + if (defined('PAGE_PARAMS') and is_numeric(PAGE_PARAMS)) $x = PAGE_PARAMS; // get list of news items @@ -160,7 +160,7 @@ switch (true) $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); // if link defined, use it in title - if ($vars['link']) + if (!empty($vars['link'])) { $vars['link'] = str_replace("{\$root}", $html->_web_root, $vars['link']); $vars['title'] = '<a href="'.$vars['link'].'">'.$vars['title'].'</a>'; @@ -190,19 +190,19 @@ switch (true) $next_link = ""; // add back to first page link when not first page if ($x != 0) - $prev_link .= $html->ahref("[First Page]", $_SERVER['PHP_SELF'], 'class="menuItem"')." "; + $prev_link .= $html->ahref('<span class="glyphicon glyphicon-fast-backward"></span>', $_SERVER['PHP_SELF'], 'class="menuItem"')." "; // display prev link if ($x > 0) - $prev_link .= $html->ahref("<< Previous Page","{$_SERVER['PHP_SELF']}".($x - $amax), 'class="menuItem"'); + $prev_link .= $html->ahref('<span class="glyphicon glyphicon-chevron-left"></span>', $_SERVER['PHP_SELF'].($x - $amax), 'class="menuItem"'); // display next link if (($x + $amax) < $total) { - $next_link .= $html->ahref("Next Page >>","{$_SERVER['PHP_SELF']}".($x + $amax) , 'class="menuItem"'); + $next_link .= $html->ahref('<span class="glyphicon glyphicon-chevron-right"></span>', $_SERVER['PHP_SELF'].($x + $amax) , 'class="menuItem"'); // add jump to last page link - $next_link .= " ".$html->ahref("[Last Page]","{$_SERVER['PHP_SELF']}".($pages * $amax) , 'class="menuItem"'); + $next_link .= " ".$html->ahref('<span class="glyphicon glyphicon-fast-forward"></span>', $_SERVER['PHP_SELF'].($pages * $amax) , 'class="menuItem"'); } // add prev/next links - echo $html->p($html->div($prev_link.'   '.$next_link, 'align="center"')); + echo $html->p($html->div($prev_link.'   '.$next_link, 'class="center"')); } // end default }

1 0

Jeremy Newman : update english files for new layout
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 8dd8c5f063c1cabafb2523881ead20332cc6ee18 URL: http://source.winehq.org/git/website.git/?a=commit;h=8dd8c5f063c1cabafb2523… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:54:57 2016 -0600 update english files for new layout --- templates/en/about.template | 1 - templates/en/devel.template | 195 ++++++++++++----------- templates/en/donate.template | 51 +++--- templates/en/download.template | 296 +++++++++++++++++------------------ templates/en/forums.template | 1 - templates/en/help.template | 119 +++++++------- templates/en/home.template | 140 +++++++++-------- templates/en/irc.template | 1 - templates/en/license.template | 1 - templates/en/wineconf/media.template | 2 +- 10 files changed, 392 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=8dd8c5f063c1cabafb…

1 0

Jeremy Newman : do not need to translate this file
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 7334e53fd0c6137aaefd3c396b3942b492102ee3 URL: http://source.winehq.org/git/website.git/?a=commit;h=7334e53fd0c6137aaefd3c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 09:56:04 2016 -0600 do not need to translate this file --- templates/tr/global/google_analytics.template | 10 ---------- templates/uk/global/google_analytics.template | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/templates/tr/global/google_analytics.template b/templates/tr/global/google_analytics.template deleted file mode 100644 index bd6624a..0000000 --- a/templates/tr/global/google_analytics.template +++ /dev/null @@ -1,10 +0,0 @@ - <script type="text/javascript"> - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '{$gcode}']); - _gaq.push(['_trackPageview']); - (function(){ - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - </script> diff --git a/templates/uk/global/google_analytics.template b/templates/uk/global/google_analytics.template deleted file mode 100644 index bd6624a..0000000 --- a/templates/uk/global/google_analytics.template +++ /dev/null @@ -1,10 +0,0 @@ - <script type="text/javascript"> - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '{$gcode}']); - _gaq.push(['_trackPageview']); - (function(){ - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - </script>

1 0

Jeremy Newman : update home page translations for new theme
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 28c604f2c37c96589e0363d1d6acd6806a63a2a9 URL: http://source.winehq.org/git/website.git/?a=commit;h=28c604f2c37c96589e0363… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:14:42 2016 -0600 update home page translations for new theme --- templates/de/home.template | 139 ++++++++++++++++++++++--------------------- templates/es/home.template | 139 ++++++++++++++++++++++--------------------- templates/fr/home.template | 141 +++++++++++++++++++++++--------------------- templates/pl/home.template | 143 ++++++++++++++++++++++++--------------------- templates/pt/home.template | 143 ++++++++++++++++++++++++--------------------- templates/tr/home.template | 139 ++++++++++++++++++++++--------------------- templates/uk/home.template | 139 ++++++++++++++++++++++--------------------- 7 files changed, 507 insertions(+), 476 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=28c604f2c37c96589e…

1 0

Jeremy Newman : remove to be re-translated
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: b325cd93f23fbc5cdeef310004c6936e0827621c URL: http://source.winehq.org/git/website.git/?a=commit;h=b325cd93f23fbc5cdeef31… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:14:58 2016 -0600 remove to be re-translated --- templates/de/global/themes/winehq/content.template | 72 --------------------- .../de/global/themes/winehq/content_nobox.template | 74 ---------------------- templates/fr/global/themes/winehq/content.template | 71 --------------------- .../fr/global/themes/winehq/content_nobox.template | 73 --------------------- templates/tr/global/themes/winehq/content.template | 71 --------------------- .../tr/global/themes/winehq/content_nobox.template | 73 --------------------- .../tr/global/themes/winehq/content_print.template | 18 ------ templates/uk/global/themes/winehq/content.template | 71 --------------------- .../uk/global/themes/winehq/content_nobox.template | 73 --------------------- .../uk/global/themes/winehq/content_print.template | 18 ------ 10 files changed, 614 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=b325cd93f23fbc5cde…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: bbe34b348dfec3a60da3f5a8d1242e6d1da28ebf URL: http://source.winehq.org/git/website.git/?a=commit;h=bbe34b348dfec3a60da3f5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:15:24 2016 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : update zh-cn translation
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 425bad19fb0248ba96501c7c95f062b853e8f7d9 URL: http://source.winehq.org/git/website.git/?a=commit;h=425bad19fb0248ba96501c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:19:59 2016 -0600 update zh-cn translation --- templates/zh-cn/home.template | 144 ++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 70 deletions(-) diff --git a/templates/zh-cn/home.template b/templates/zh-cn/home.template index e7f1648..e4b0ee7 100644 --- a/templates/zh-cn/home.template +++ b/templates/zh-cn/home.template @@ -1,90 +1,94 @@ +  -   - - -<div id="main_left"> - - <div class="content cornerround" style="padding: 15px 10px 20px 60px; height: 445px; overflow: auto;"> - <div class="winehq_menu"> - - <div class="info" onClick="document.location='{$root}/about/';"> - <div class="icon"></div> - <div class="text"> - <div class="title"><a href="{$root}/about/">关于</a></div> - <div class="subtitle">了解 Wine 项目. </div> - </div> + + +<div class="row"> + <div class="col-sm-7"> + + <div class="whq-page-container margin-bottom-md"> + <h3 class="title">最新发布</h3> + <div class="row"> + <div class="col-sm-4 col-md-3">稳定版：</div> + <div class="col-sm-8"> + <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> + <span class="small"> + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_stable_release}">shortlog</a>) + </span> + </div> </div> - - <div class="dl" onClick="document.location='{$root}/download/';"> - <div class="icon"></div> - <div class="text"> - <div class="title"><a href="{$root}/download/">下载</a></div> - <div class="subtitle">安装最新的 Wine. </div> - </div> + <div class="row"> + <div class="col-sm-4 col-md-3">开发版：</div> + <div class="col-sm-8"> + <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> + <span class="small"> + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_master_release}">shortlog</a>) + </span> + </div> </div> + </div> - <div class="help" onClick="document.location='{$root}/help/';"> - <div class="icon"></div> - <div class="text"> - <div class="title"><a href="{$root}/help/">支持</a></div> - <div class="subtitle">获取帮助. </div> - </div> - </div> + <div class="whq-page-container"> - <div class="devel" onClick="document.location='{$root}/devel/';"> - <div class="icon"></div> - <div class="text"> - <div class="title"><a href="{$root}/devel/">开发</a></div> - <div class="subtitle">成为 Wine 开发者. </div> - </div> + <div class="winehq_menu nopadding margin-bottom-lg"> + <a class="winehq_menu_item info nomargin" href="{$root}/about"> + <span class="icon"></span> + <span class="title">关于</span> + <span class="subtitle">了解 Wine 项目.</span> + </a> + <div class="clear"></div> </div> - <div class="donate" onClick="document.location='{$root}/donate/';"> - <div class="icon"></div> - <div class="text"> - <div class="title"><a href="{$root}/donate/">捐助</a></div> - <div class="subtitle">捐助 Wine 项目. </div> - </div> - </div> + <p>Wine （“Wine Is Not an Emulator” 的首字母缩写）是一个能够在多种 POSIX-compliant 操作系统（诸如 Linux，Mac OSX 及 BSD 等）上运行 Windows 应用的兼容层。 +Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而是將 Windows API 调用翻译成为动态的 POSIX 调用，免除了性能和其他一些行为的内存占用，让你能够干净地集合 Windows 应用到你的桌面。</p> </div> + </div> + <div class="col-sm-5 winehq_menu_wrap fill-height"> + + <div class="whq-page-container winehq_menu fill-height"> + + <a class="winehq_menu_item dl" href="{$root}/download"> + <span class="icon"></span> + <span class="title">下载</span> + <span class="subtitle">安装最新的 Wine.</span> + </a> + <div class="clear"></div> + + <a class="winehq_menu_item help" href="{$root}/help"> + <span class="icon"></span> + <span class="title">支持</span> + <span class="subtitle">获取帮助.</span> + </a> + <div class="clear"></div> + + <a class="winehq_menu_item devel" href="{$root}/devel"> + <span class="icon"></span> + <span class="title">开发</span> + <span class="subtitle">成为 Wine 开发者.</span> + </a> + <div class="clear"></div> + + <a class="winehq_menu_item donate" href="{$root}/donate"> + <span class="icon"></span> + <span class="title">捐助</span> + <span class="subtitle">捐助 Wine 项目.</span> + </a> + <div class="clear"></div> + + </div> -</div> -<div id="main_right"> - - <div class="content cornerround" style="padding: 10px; height: 85px; overflow: auto;"> - <h3 class="title" style="margin: 0;">最新发布</h3> - <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> - <tr><td>稳定版：</td> - <td style="padding-left: 15px; padding-bottom: 2px;"> - <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> - <span class="small"> - (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_stable_release}">shortlog</a>) - </span> - </td></tr> - <tr><td>开发版：</td> - <td style="padding-left: 15px;"> - <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> - <span class="small"> - (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_master_release}">shortlog</a>) - </span> - </td></tr> - </table> </div> +</div> - <div class="content cornerround" style="margin-top: 15px; padding: 10px 0px 10px 10px;"> - <div style="height: 340px; overflow: auto; padding-right: 10px;"> +<div class="whq-page-container margin-top-md"> - <h3 class="title"><a href="{$root}/news/">新闻</a></h3> + <h1 class="title"><a href="{$root}/news">新闻</a></h1> -  +  - <p><a href="{$root}/news/">更多新闻……</a></p> - </div> - </div> + <p><a href="{$root}/news">更多新闻……</a></p> </div> -

1 0

Jeremy Newman : status link should be in the wine wiki
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 7202cfa52aa42c91d556133e0eee71ac0eb4d648 URL: http://source.winehq.org/git/website.git/?a=commit;h=7202cfa52aa42c91d55613… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:31:48 2016 -0600 status link should be in the wine wiki also fix the codeweavers internship link --- templates/de/devel.template | 4 +- templates/en/devel.template | 3 +- templates/en/status.template | 133 ------------------------------------------- templates/pl/devel.template | 4 +- templates/tr/devel.template | 4 +- templates/tr/status.template | 129 ----------------------------------------- 6 files changed, 7 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7202cfa52aa42c91d5…

1 0

Jeremy Newman : add translation methods to html class
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 7cd0f5d3599658bd4cae44f20fd18ce624af4117 URL: http://source.winehq.org/git/website.git/?a=commit;h=7cd0f5d3599658bd4cae44… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 10:36:14 2016 -0600 add translation methods to html class --- include/html.php | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/include/html.php b/include/html.php index df4bb4f..439cb96 100644 --- a/include/html.php +++ b/include/html.php @@ -1267,6 +1267,153 @@ class html return $str; } + // LOAD_TRANS (load a new translation table) + // $table - table to load + // $lang - language override + public function load_trans ($table, $lang = null) + { + // set language + if (empty($lang)) + $lang = $this->lang; + + // if table is loaded already, return + if (isset($this->trans_table[$lang][$table])) + return; + + // init XMLToArray + check_and_require("XMLToArray"); + $xml = new XMLToArray(); + + // load table XML (fallback to english) + if (file_exists("{$this->_file_root}/templates/{$lang}/global/xml/trans/{$table}.xml")) + $xml->filename = "{$this->_file_root}/templates/{$lang}/global/xml/trans/{$table}.xml"; + else if ($lang != "en" and file_exists("{$this->_file_root}/templates/en/global/xml/trans/{$table}.xml")) + $xml->filename = "{$this->_file_root}/templates/en/global/xml/trans/{$table}.xml"; + else + trigger_error("Unable to load translation XML", E_USER_ERROR); + + // parse XML into array + $data = $xml->parse(); + + // parse the translation table + $this->trans_table[$lang][$table] = $this->parse_trans_array($data['trans']['#']['str']); + + // debug load trans + debug("func", "html:load_trans() -> table[{$lang}:{$table}]"); + if ($GLOBALS['config']->web_debug and method_exists($GLOBALS['login'], 'checkpriv') + and $GLOBALS['login']->checkpriv($GLOBALS['login']->id, "debug_trans")) + crap("trans: templates/{$lang}/global/xml/trans/{$table}.xml"); + + // done + return 1; + } + + // PARSE TRANS ARRAY (nested translation array parser) + // $data - XML string array + private function parse_trans_array ($data) + { + // array for storage + $arr = array(); + // loop and add strings + foreach ($data as $in) + { + if (is_array($in['#'])) + { + // nested elements, continue parsing tree + $arr[$in['@']['name']] = $this->parse_trans_array($in['#']['str']); + } + else + { + // single element, return it + $arr[$in['@']['name']] = $in['#']; + } + } + // return final array + return $arr; + } + + // UNLOAD_TRANS (clear a translation table from memory) + // $table - table to unload + public function unload_trans ($table) + { + debug("func", "html:unload_trans() -> table[{$table}]"); + unset($this->trans_table[$this->lang][$table]); + return true; + } + + // TRANS (return a processed string from the translastion table) + // $table - table to load string from + // $str - name of str to load + // $vars - array of vars to load into string + public function trans ($table = "global", $str = "", $vars = array()) + { + // language override + if (preg_match('/:/', $table)) + list($lang, $table) = preg_split('/:/', $table, 2); + else + $lang = $this->lang; + + debug("func", "html:trans() -> table[{$lang}:{$table}] str[{$str}]"); + $this->load_trans($table, ($lang == $this->lang ? null : $lang)); + $out = $this->trans_table[$lang][$table][$str]; + if (count($vars) > 0) + { + foreach ($vars as $x => $val) + { + $out = str_replace('{$'.$x.'}', $val, $out); + } + } + return $out; + } + + // TRANS VAL (return a single value of a nested trans array) + // $table - table to load string from + // $str - name of str array + // $val - value to return from array + // $vars = array of vars to load into string + public function trans_val ($table, $str, $val, $vars = array()) + { + // language override + if (preg_match('/:/', $table)) + list($lang, $table) = preg_split('/:/', $table, 2); + else + $lang = $this->lang; + + debug("func", "html:trans_val() -> table[{$table}] str[{$str}] val[{$val}]"); + $this->load_trans($table, ($lang == $this->lang ? null : $lang)); + if (is_array($this->trans_table[$lang][$table][$str]) and $this->trans_table[$lang][$table][$str][$val]) + { + $out = $this->trans_table[$lang][$table][$str][$val]; + if (count($vars) > 0) + { + foreach ($vars as $x => $val) + { + $out = str_replace('{$'.$x.'}', $val, $out); + } + } + return $out; + } + return ""; + } + + // GET TRANS (return a single element of trans array, no further processing, used for translation arrays) + // $table - table to load string from + // $str - name of str (array) to return + public function get_trans ($table, $str) + { + debug("func", "html:get_trans() -> table[{$table}] str[{$str}]"); + $this->load_trans($table); + return $this->trans_table[$this->lang][$table][$str]; + } + + // GET_TRANS_TABLE (return an entire trans table, also load if not loaded) + // $table - trans table + public function get_trans_table ($table) + { + $this->load_trans($table); + return $this->trans_table[$this->lang][$table]; + } + // TEMPLATE (read a template file and fill in the variables) public function template ($theme = null, $template, $vars = null, $noremovetags = 0) {

1 0

Jeremy Newman : remove debug func from trans
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: d7bae83b667166b0a0d4b220f9f30e6d950ee403 URL: http://source.winehq.org/git/website.git/?a=commit;h=d7bae83b667166b0a0d4b2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:21:04 2016 -0600 remove debug func from trans --- include/html.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/html.php b/include/html.php index 439cb96..feaec1f 100644 --- a/include/html.php +++ b/include/html.php @@ -1300,9 +1300,6 @@ class html // debug load trans debug("func", "html:load_trans() -> table[{$lang}:{$table}]"); - if ($GLOBALS['config']->web_debug and method_exists($GLOBALS['login'], 'checkpriv') - and $GLOBALS['login']->checkpriv($GLOBALS['login']->id, "debug_trans")) - crap("trans: templates/{$lang}/global/xml/trans/{$table}.xml"); // done return 1;

1 0