diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-19 21:10:57 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-19 21:10:57 -0700 |
| commit | 905374c86ef78dd6a2c1f7e37b6d290428e6259e (patch) | |
| tree | bea876dfb4a4f30ffdc4cff75b70edd1b595f9d8 | |
| parent | 30841d94709f025a03362b711c4dc2fee85285a7 (diff) | |
| download | volse-hubzilla-905374c86ef78dd6a2c1f7e37b6d290428e6259e.tar.gz volse-hubzilla-905374c86ef78dd6a2c1f7e37b6d290428e6259e.tar.bz2 volse-hubzilla-905374c86ef78dd6a2c1f7e37b6d290428e6259e.zip | |
experimental rtl support; this will probably require a fair bit of work.
| -rwxr-xr-x | boot.php | 7 | ||||
| -rw-r--r-- | util/po2php.php | 12 | ||||
| -rw-r--r-- | view/php/default.php | 2 |
3 files changed, 18 insertions, 3 deletions
@@ -771,6 +771,7 @@ class App { public static $groups; public static $language; public static $langsave; + public static $rtl = false; public static $plugins_admin; public static $module_loaded = false; public static $query_string; @@ -2282,6 +2283,12 @@ function construct_page(&$a) { $page = App::$page; $profile = App::$profile; + // There's some experimental support for right-to-left text in the view/php/default.php page template. + // In v1.9 we started providing direction preference in the per language hstrings.php file + // This requires somebody with fluency in a RTL language to make happen + + $page['direction'] = 0; // ((App::$rtl) ? 1 : 0); + header("Content-type: text/html; charset=utf-8"); // security headers - see https://securityheaders.io diff --git a/util/po2php.php b/util/po2php.php index ab8c495f9..a72a65ba1 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -3,14 +3,21 @@ function po2php_run($argc,$argv) { - if ($argc!=2) { + if ($argc < 2) { print "Usage: ".$argv[0]." <file.po>\n\n"; return; } - + + $rtl = false; + $pofile = $argv[1]; $outfile = dirname($pofile)."/hstrings.php"; + if($argc > 2) { + if($argv[2] === 'rtl') + $rtl = true; + } + if(strstr($outfile,'util')) $lang = 'en'; else @@ -53,6 +60,7 @@ function po2php_run($argc,$argv) { $out .= ' return '.$cond.';'."\n"; $out .= '}}'."\n"; } + $out .= 'App::$rtl = ' . intval($rtl) . ';'; if ($k!="" && substr($l,0,7)=="msgstr "){ if ($ink) { $ink = False; $out .= 'App::$strings["'.$k.'"] = '; } diff --git a/view/php/default.php b/view/php/default.php index ad6b7a3d1..f5be4fa35 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -5,7 +5,7 @@ <script>var baseurl="<?php echo z_root() ?>";</script> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> </head> -<body> +<body <?php if($page['direction']) echo 'dir="rtl"' ?> > <?php if(x($page,'banner')) echo $page['banner']; ?> <header><?php if(x($page,'header')) echo $page['header']; ?></header> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> |