Merge branch 'master' of git.tt-rss.org:fox/tt-rss

classes/pluginhost.php

@@ -1,4 +1,18 @@
 <?php
+/* gettext helpers for plugins */
+
+function P__($plugin, $msgid) {
+	return P_gettext($plugin, $msgid);
+}
+
+function P_gettext($plugin, $msgid) {
+	return _dgettext(PLuginHost::object_to_domain($plugin), $msgid);
+}
+
+function P_ngettext($plugin, $singular, $plural, $number) {
+	return _dngettext(PLuginHost::object_to_domain($plugin), $singular, $plural, $number);
+}
+
 class PluginHost {
 	private $pdo;
 	private $hooks = array();
@@ -63,6 +77,10 @@ class PluginHost {
 	const KIND_SYSTEM = 2;
 	const KIND_USER = 3;
 
+	static function object_to_domain($plugin) {
+		return strtolower(get_class($plugin));
+	}
+
 	function __construct() {
 		$this->pdo = Db::pdo();
 
@@ -211,6 +229,11 @@ class PluginHost {
 						continue;
 					}
 
+					if (file_exists(dirname($file) . "/locale")) {
+						_bindtextdomain($class, dirname($file) . "/locale");
+						_bind_textdomain_codeset($class, "UTF-8");
+					}
+
 					$this->last_registered = $class;
 
 					switch ($kind) {

css/default.css

@@ -932,6 +932,26 @@ body.ttrss_utility .alert .close {
   line-height: 20px;
   cursor: pointer;
 }
+body.ttrss_main .pull-right,
+body.ttrss_utility .pull-right {
+  float: right;
+}
+body.ttrss_main .pull-left,
+body.ttrss_utility .pull-left {
+  float: left;
+}
+body.ttrss_main .text-error,
+body.ttrss_utility .text-error {
+  color: #b94a48;
+}
+body.ttrss_main .text-info,
+body.ttrss_utility .text-info {
+  color: #3a87ad;
+}
+body.ttrss_main .text-success,
+body.ttrss_utility .text-success {
+  color: #468847;
+}
 body.ttrss_main .alert,
 body.ttrss_utility .alert,
 body.ttrss_main .alert h4,

css/tt-rss.less

@@ -1109,6 +1109,26 @@ body.ttrss_main, body.ttrss_utility {
 		}
 	}
 
+	.pull-right {
+		float : right;
+	}
+
+	.pull-left {
+		float : left;
+	}
+
+	.text-error {
+		color: #b94a48;
+	}
+
+	.text-info {
+		color: #3a87ad;
+	}
+
+	.text-success {
+		color: #468847;
+	}
+
 	.alert,
 	.alert h4 {
 		color: #c09853;

include/functions.php

@@ -141,7 +141,6 @@
 			}
 
 			_bindtextdomain("messages", "locale");
-
 			_textdomain("messages");
 			_bind_textdomain_codeset("messages", "UTF-8");
 		}
@@ -2403,18 +2402,23 @@
 				return __((parseInt(n) > 1) ? msg2 : msg1);
 			}';
 
-		$l10n = _get_reader();
+		global $text_domains;
 
-		for ($i = 0; $i < $l10n->total; $i++) {
+		foreach (array_keys($text_domains) as $domain) {
-			$orig = $l10n->get_original_string($i);
+			$l10n = _get_reader($domain);
-			if(strpos($orig, "\000") !== FALSE) { // Plural forms
+
-				$key = explode(chr(0), $orig);
+			for ($i = 0; $i < $l10n->total; $i++) {
-				print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
+				$orig = $l10n->get_original_string($i);
-				print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
+				if(strpos($orig, "\000") !== FALSE) { // Plural forms
-			} else {
+					$key = explode(chr(0), $orig);
-				$translation = __($orig);
+					print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
-				print T_js_decl($orig, $translation);
+					print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
+				} else {
+					$translation = _dgettext($domain,$orig);
+					print T_js_decl($orig, $translation);
+				}
 			}
+
 		}
 	}
 

themes/night.css

@@ -933,6 +933,26 @@ body.ttrss_utility .alert .close {
   line-height: 20px;
   cursor: pointer;
 }
+body.ttrss_main .pull-right,
+body.ttrss_utility .pull-right {
+  float: right;
+}
+body.ttrss_main .pull-left,
+body.ttrss_utility .pull-left {
+  float: left;
+}
+body.ttrss_main .text-error,
+body.ttrss_utility .text-error {
+  color: #b94a48;
+}
+body.ttrss_main .text-info,
+body.ttrss_utility .text-info {
+  color: #3a87ad;
+}
+body.ttrss_main .text-success,
+body.ttrss_utility .text-success {
+  color: #468847;
+}
 body.ttrss_main .alert,
 body.ttrss_utility .alert,
 body.ttrss_main .alert h4,

themes/night_blue.css

@@ -933,6 +933,26 @@ body.ttrss_utility .alert .close {
   line-height: 20px;
   cursor: pointer;
 }
+body.ttrss_main .pull-right,
+body.ttrss_utility .pull-right {
+  float: right;
+}
+body.ttrss_main .pull-left,
+body.ttrss_utility .pull-left {
+  float: left;
+}
+body.ttrss_main .text-error,
+body.ttrss_utility .text-error {
+  color: #b94a48;
+}
+body.ttrss_main .text-info,
+body.ttrss_utility .text-info {
+  color: #3a87ad;
+}
+body.ttrss_main .text-success,
+body.ttrss_utility .text-success {
+  color: #468847;
+}
 body.ttrss_main .alert,
 body.ttrss_utility .alert,
 body.ttrss_main .alert h4,