Changeset 276 in t29-www for lib

Timestamp:

Jul 7, 2012, 7:45:22 PM (11 years ago)

Author:

sven

Message:

Weitere Fixes in den Geräteseiten:

• Univac-Geräteseiten konvertiert
• Interlang-System verbessert (bessere Ausgabe bei nicht existierenden Interlang-Links)

Location:

lib

Files:

• messages.php (modified) (6 diffs)
• template.php (modified) (2 diffs)

lib/messages.php

@@ -17 +17 @@
         /// when instanciated, stores the language to lookup for _()
         public $lang;
-
+        
         /// The order of array elements in $msg. This array maps
         /// $lang shortstring to array index position.
@@ -30 +30 @@
          * There's actually no long method name version :D
          * @param str_id  Some key from the $msg array
+         * @param lang  The wanted target language (string like 'de' or 'en'). Leave empty for object default lang ($this->lang)
          * @returns Found string in current locale ($lang)
          **/
-        function _($str_id) {
+        function _($str_id, $lang=null) {
+                $lang = ($lang && isset(self::$order[$lang])) ? $lang : $this->lang;
                 if(!isset(self::$msg[$str_id])) {
                         return "<$str_id>"; // error; mediawiki style
                 } else {
                         if(is_array(self::$msg[$str_id])) {
-                                return self::$msg[$str_id][ self::$order[$this->lang] ];
+                                return self::$msg[$str_id][ self::$order[$lang] ];
                         } else
                                 return self::$msg[$str_id];
@@ -53 +55 @@
         function get_shorthand_printer() {
                 $t = $this;
-                return function($str)use($t) { print $t->_($str); };
+                return function($str,$lang=null)use($t) { print $t->_($str,$lang); };
         }
 
@@ -59 +61 @@
         function get_shorthand_returner() {
                 $t = $this;
-                return function($str)use($t) { return $t->_($str); };
+                return function($str,$lang=null)use($t) { return $t->_($str,$lang); };
         }
 
@@ -94 +96 @@
                 'sidebar-h2-lang'        => array('Sprachauswahl', 'Language'),
 
-                'topnav-interlang-title' => array('Read this page (%s) in English', 'Diese Seite (%s) auf Deutsch lesen'),
+                'topnav-interlang-title' => array('Die Seite "%s" auf Deutsch lesen', 'Read the page "%s" in English'),
+                'topnav-interlang-active' => array('Sie betrachten gerade die Seite "%s" auf Deutsch', 'You currently read the page "%s" in English'),
+                'topnav-interlang-nonexistent' => array('Diese Seite steht auf Deutsch nicht zur Verfügung', 'This page is not available in English'),
                 'topnav-search-label'    => array('Suchen', 'Search'),
                 'topnav-search-page'     => array('/suche.php', '/search.php'),
@@ -115 +119 @@
                 'head-rel-prev'          => array('Zur vorherigen Seite (%s)', 'Previous Page (%s)'),
                 'head-rel-next'          => array('Zur folgenden Seite (%s)', 'Next Page (%s)'),
-                'head-rel-interlang'     => array('Englische Version dieser Seite (%s)', 'Deutsche Version dieser Seite (%s)'),
+                'head-rel-interlang'     => array('Deutsche Version dieser Seite (%s)', 'English Version of this page (%s)'),
                 
                 // used in /shared/js/modules/heading_links.js

lib/template.php

@@ -121 +121 @@
         // print interlanguage links for all languages except the active one
         foreach($this->interlang_links as $lang => $a) {
-                if($lang != $this->conf['lang']) {
+                if($lang != $this->conf['lang'] && !is_null($a)) {
                         printf('<link rel="alternate" href="%s" hreflang="%s" title="%s">',
-                                $a['href'], $lang, sprintf($_('head-rel-interlang'), $a)
+                                $a['href'], $lang, sprintf($_('head-rel-interlang', $lang), $a)
                         );
                 }
@@ -192 +192 @@
                                 <?php
                                         foreach($this->interlang_links as $lang => $a) {
+                                                $is_current_lang = $lang == $this->conf['lang'];
+                                                if(is_null($a)) {
+                                                        // when interlanguage link not present (null) = no translation exists
+                                                        $a = t29Menu::dom_new_link('#', 'not present');
+                                                        $title = sprintf($_('topnav-interlang-nonexistent', $lang));
+                                                        $class = 'nonexistent';
+                                                } elseif($is_current_lang) {
+                                                        $title = sprintf($_('topnav-interlang-active'), $a);
+                                                        $class = 'active';
+                                                } else {
+                                                        // ordinary interlang link
+                                                        $title = sprintf($_('topnav-interlang-title', $lang), $a);
+                                                        $class = '';
+                                                }
                                                 printf("\t\t\t\t<li%s><a href='%s' title='%s'>%s</a></li>\n",
-                                                        ($lang == $this->conf['lang'] ? ' class="active"' : ''),
-                                                        $a['href'], sprintf($_('topnav-interlang-title'), $a),
+                                                        (empty($class) ? '' : " class='$class'"),
+                                                        $a['href'], htmlspecialchars($title),
                                                         $this->conf['languages'][$lang][0] // verbose language name
                                                 );