diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 9ccae5be3..6432bd020 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -62,6 +62,7 @@ New features:: Improvements:: + * core: evaluate content of option "weechat.look.item_time_format" (issue #791) * core: change default value of option weechat.look.nick_color_hash to "djb2" * core: move nick coloring from irc plugin to core, move options irc.look.nick_color_force, irc.look.nick_color_hash and irc.look.nick_color_stop_chars to core, add info "nick_color" and "nick_color_name", deprecate info "irc_nick_color" and "irc_color_name" (issue #262) * core: move irc bar item "away" to core, move options irc.look.item_away_message and irc.color.item_away to core (issue #692) diff --git a/doc/de/autogen/user/weechat_options.adoc b/doc/de/autogen/user/weechat_options.adoc index eb208a608..61af98458 100644 --- a/doc/de/autogen/user/weechat_options.adoc +++ b/doc/de/autogen/user/weechat_options.adoc @@ -703,7 +703,7 @@ ** Werte: beliebige Zeichenkette (Standardwert: `+"M"+`) * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format* -** Beschreibung: pass:none[Format für die Zeitanzeige des Bar-Items, "time" (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden)] +** Beschreibung: pass:none[time format for "time" bar item (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)] ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `+"%H:%M"+`) diff --git a/doc/en/autogen/user/weechat_options.adoc b/doc/en/autogen/user/weechat_options.adoc index a93436ea9..ceeff8800 100644 --- a/doc/en/autogen/user/weechat_options.adoc +++ b/doc/en/autogen/user/weechat_options.adoc @@ -703,7 +703,7 @@ ** values: any string (default value: `+"M"+`) * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format* -** description: pass:none[time format for "time" bar item (see man strftime for date/time specifiers)] +** description: pass:none[time format for "time" bar item (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)] ** type: string ** values: any string (default value: `+"%H:%M"+`) diff --git a/doc/fr/autogen/user/weechat_options.adoc b/doc/fr/autogen/user/weechat_options.adoc index d008bdcdf..26e72b186 100644 --- a/doc/fr/autogen/user/weechat_options.adoc +++ b/doc/fr/autogen/user/weechat_options.adoc @@ -703,7 +703,7 @@ ** valeurs: toute chaîne (valeur par défaut: `+"M"+`) * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format* -** description: pass:none[format de date/heure pour l'objet de barre "time" (voir man strftime pour le format de date/heure)] +** description: pass:none[format de date/heure pour l'objet de barre "time" (voir man strftime pour le format de date/heure) (note : le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)] ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `+"%H:%M"+`) diff --git a/doc/it/autogen/user/weechat_options.adoc b/doc/it/autogen/user/weechat_options.adoc index 649fe39a8..612b411b6 100644 --- a/doc/it/autogen/user/weechat_options.adoc +++ b/doc/it/autogen/user/weechat_options.adoc @@ -703,7 +703,7 @@ ** valori: qualsiasi stringa (valore predefinito: `+"M"+`) * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format* -** descrizione: pass:none[formato dell'ora per l'elemento barra "time" (consultare man strftime per gli specificatori data/ora)] +** descrizione: pass:none[time format for "time" bar item (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)] ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `+"%H:%M"+`) diff --git a/doc/ja/autogen/user/weechat_options.adoc b/doc/ja/autogen/user/weechat_options.adoc index cbf780375..db1afd093 100644 --- a/doc/ja/autogen/user/weechat_options.adoc +++ b/doc/ja/autogen/user/weechat_options.adoc @@ -703,7 +703,7 @@ ** 値: 未制約文字列 (デフォルト値: `+"M"+`) * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format* -** 説明: pass:none["time" バー要素の時間書式 (日付/時間指定子は strftime の man を参照)] +** 説明: pass:none[time format for "time" bar item (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)] ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `+"%H:%M"+`) diff --git a/doc/pl/autogen/user/weechat_options.adoc b/doc/pl/autogen/user/weechat_options.adoc index 8ab8812d5..4ef6587e9 100644 --- a/doc/pl/autogen/user/weechat_options.adoc +++ b/doc/pl/autogen/user/weechat_options.adoc @@ -703,7 +703,7 @@ ** wartości: dowolny ciąg (domyślna wartość: `+"M"+`) * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format* -** opis: pass:none[format czasu dla elementu paska "time" (zobacz man strftime dla specyfikatorów daty/czasu)] +** opis: pass:none[time format for "time" bar item (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)] ** typ: ciąg ** wartości: dowolny ciąg (domyślna wartość: `+"%H:%M"+`) diff --git a/po/cs.po b/po/cs.po index e2650e437..30fdb8256 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:42+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" "Language: cs\n" @@ -3208,8 +3208,11 @@ msgstr "" msgid "string used to show if mouse is enabled (bar item \"mouse_status\")" msgstr "" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" "časový formát pro \"time\" položku panelu (viz. man strftime pro specifikaci " "data/času)" @@ -11381,17 +11384,3 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "výchozí zpráva při odchodu z kanálu (\"%v\" bude nahrazeno verzí WeeChat " -#~ "v řetězci)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "výchozí zpráva při uknočnení (odpojení od serveru) (\"%v\" bude nahrazeno " -#~ "verzí WeeChat v řetězci)" diff --git a/po/de.po b/po/de.po index c23feb108..ab184c53f 100644 --- a/po/de.po +++ b/po/de.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-08-31 15:30+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German <>\n" "Language: de\n" @@ -3071,8 +3071,10 @@ msgstr "" " left: wechselt zum linken Fenster\n" " right: wechselt zum rechten Fenster\n" " number: Nummer des Fensters (siehe /window list)\n" -" splith: teilt das aktuelle Fenster horizontal (um den Vorgang rückgängig zu machen: /window merge)\n" -" splitv: teilt das aktuelle Fenster vertikal (um den Vorgang rückgängig zu machen: /window merge)\n" +" splith: teilt das aktuelle Fenster horizontal (um den Vorgang " +"rückgängig zu machen: /window merge)\n" +" splitv: teilt das aktuelle Fenster vertikal (um den Vorgang " +"rückgängig zu machen: /window merge)\n" " resize: verändert die Größe des aktuellen Fensters. Die neue Größe " "des Fensters ist prozentual zum Stammfensters groß\n" " balance: passt die Größe aller Fenster an\n" @@ -3797,11 +3799,15 @@ msgstr "" "Zeichen mit welchem signalisiert wird ob die Mausfunktionalität " "eingeschaltet ist (durch Bar-Item \"mouse_status\")" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" -"Format für die Zeitanzeige des Bar-Items, \"time\" (siehe man strftime, " -"welche Platzhalter für das Datum und die Uhrzeit verwendet werden)" +"Präfix, dass bei einer Fehlernachricht genutzt wird (Hinweis: Inhalt wird " +"evaluiert, somit kann mittels des Formats \"${color:xxx} Farben gesetzt " +"werden, siehe /help eval)" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -12956,17 +12962,3 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "Standardmitteilung beim Verlassen eines Channels (\"%v\": wird durch die " -#~ "WeeChat-Version ersetzt)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "Standardmitteilung beim Beenden (Verbindung zum Server trennen) (\"%v\": " -#~ "wird durch die WeeChat-Version ersetzt)" diff --git a/po/es.po b/po/es.po index cbf229d19..fced4e5d2 100644 --- a/po/es.po +++ b/po/es.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:42+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" "Language: es\n" @@ -3358,8 +3358,11 @@ msgstr "" "cadena a usar para indicar que algunas líneas están filtradas en el buffer " "actual (elemento de barra \"buffer_filter\")" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" "formato de hora para el elemento de barra \"time\" (ver el manual de " "strftime para los especificadores de fecha/hora)" @@ -11641,17 +11644,3 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: no es posible conectarse al transmisor" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "mensaje de abandono por defecto (cuando se abandona un canal) (\"%v\" " -#~ "será reemplazado por la versión de WeeChat)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "mensaje de salida por defecto (cuando se desconecta del servidor) (\"%v\" " -#~ "será reemplazado por la versión de WeeChat)" diff --git a/po/fr.po b/po/fr.po index bb5be4dca..2ba0655bf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-08-30 18:34+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -3708,10 +3708,13 @@ msgstr "" "\"mouse_status\")" msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" "format de date/heure pour l'objet de barre \"time\" (voir man strftime pour " -"le format de date/heure)" +"le format de date/heure) (note : le contenu est évalué, donc vous pouvez " +"utiliser des couleurs avec le format \"${color:xxx}\", voir /help eval)" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -12696,17 +12699,3 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "message par défaut pour le part (en quittant un canal) (\"%v\" sera " -#~ "remplacé par la version de WeeChat dans la chaîne)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "message de fin par défaut (lors de la déconnexion du serveur) (\"%v\" " -#~ "sera remplacé par la version de WeeChat dans la chaîne)" diff --git a/po/hu.po b/po/hu.po index 6d112e0cd..f8b914352 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:43+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" "Language: hu\n" @@ -2793,9 +2793,12 @@ msgstr "" msgid "string used to show if mouse is enabled (bar item \"mouse_status\")" msgstr "" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" -msgstr "" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" +msgstr "új nap kezdetével megjelenő időbélyeg" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -10682,19 +10685,3 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n" - -#, fuzzy -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "alapértelmezett távozó üzenet (szoba elhagyásakor) (a '%v' változó a " -#~ "WeeChat verziójára cserélődik)" - -#, fuzzy -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "alapértelmezett kilépő üzenet (a '%v' változó a WeeChat verziójára " -#~ "cserélődik)" diff --git a/po/it.po b/po/it.po index 9251f1d91..d638fe52c 100644 --- a/po/it.po +++ b/po/it.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:43+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" "Language: it\n" @@ -3452,11 +3452,15 @@ msgstr "" "stringa usata per mostrare che alcune righe sono state filtrate nel buffer " "corrente (elemento barra \"buffer_filter\")" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" -"formato dell'ora per l'elemento barra \"time\" (consultare man strftime per " -"gli specificatori data/ora)" +"prefisso per i messaggi di errore (nota: il contenuto viene valutato, per " +"cui è possibile usare colori con il formato \"${color:xxx}\", consultare /" +"help eval" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -11828,17 +11832,3 @@ msgstr "%s%s: timeout per \"%s\" con %s" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: impossibile connettersi al mittente" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "messaggio di uscita predefinito (in uscita dal canale) (\"%v\" verrà " -#~ "sostituito dalla versione di WeeChat)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "messaggio di abbandono predefinito (disconnessione dal server) (\"%v\" " -#~ "verrà sostituito dalla versione di WeeChat)" diff --git a/po/ja.po b/po/ja.po index cb5b664c3..341f98c11 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-08-21 09:00+0900\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -3575,9 +3575,14 @@ msgstr "" msgid "string used to show if mouse is enabled (bar item \"mouse_status\")" msgstr "マウスが有効であることを示す文字列 (バー要素 \"mouse_status\")" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" -msgstr "\"time\" バー要素の時間書式 (日付/時間指定子は strftime の man を参照)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" +msgstr "" +"エラーメッセージのプレフィックス (注意: 値は評価されるため、\"${color:xxx}\" " +"書式を使えば色を指定することも出来ます、/help eval を参照)" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -12199,17 +12204,3 @@ msgstr "%s%s: \"%s\" のタイムアウト %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: 接続できません: 未定義のエラー (%d)" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "デフォルトの退出メッセージ (チャンネルから出る際の) (\"%v\" は WeeChat " -#~ "バージョンで置換)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "デフォルトの終了メッセージ (サーバとの接続を切る際の) (\"%v\" は WeeChat " -#~ "バージョンで置換)" diff --git a/po/pl.po b/po/pl.po index bef870532..499231dcf 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:43+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" "Language: pl\n" @@ -3654,11 +3654,14 @@ msgstr "" "ciąg użyty do pokazania czy obsługa myszy jest włączona (element paska " "\"mouse_status\")" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" -"format czasu dla elementu paska \"time\" (zobacz man strftime dla " -"specyfikatorów daty/czasu)" +"przedrostek dla wiadomości o błędach (uwaga: zawartość jest przetwarzana, " +"dlatego można użyć kolorów w formacie \"${color:xxx}\", zobacz /help eval)" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -12427,17 +12430,3 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "domyślna wiadomość opuszczenia kanału (\"%v\" zostanie zastąpione wersja " -#~ "WeeChat)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "domyślna wiadomość wyjścia z IRC (rozłączenia z serwerem) (\"%v\" " -#~ "zostanie zastąpione wersją WeeChat)" diff --git a/po/pt.po b/po/pt.po index 53a51326d..9b89f572c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:43+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" "Language: pt\n" @@ -3644,11 +3644,14 @@ msgstr "" "cadeia utilizada para mostrar que o rato está ativado (bar item " "\"mouse_status\")" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" -"formato de data/hora para o item de barra \"time\" (ver man strftime para " -"especificadores de data/hora)" +"prefixo de mensagens de erro (nota: o conteúdo é avaliado, por isso pode " +"utilizar cores com o formato \"${color:xxx}\", ver /help eval)" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -12438,17 +12441,3 @@ msgstr "%s%s: tempo limite de \"%s\" com %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar: erro inesperado (%d)" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "mensagem de saída predefinida (ao sair do canal) (\"%v\" é substituído " -#~ "pela versão do WeeChat na cadeia)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "mensagem de saída predefinida (ao desconectar-se do servidor) (\"%v\" é " -#~ "substituído pela versão do WeeChat na cadeia)" diff --git a/po/pt_BR.po b/po/pt_BR.po index c43430941..c7b3731b3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:43+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" "Language: pt_BR\n" @@ -3378,8 +3378,11 @@ msgstr "" msgid "string used to show if mouse is enabled (bar item \"mouse_status\")" msgstr "" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" "formato de tempo para o item de barra \"time\" (veja man strftime para " "especificadores de data/tempo)" @@ -11121,17 +11124,3 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar ao remetente" - -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "" -#~ "mensagem padrão de partida (deixando canal) (\"%v\" será substituído pela " -#~ "string de versão do WeeChat)" - -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "mensagem padrão de saída (desconectando do servidor) (\"%v\" será " -#~ "substituído pela string de versão do WeeChat)" diff --git a/po/ru.po b/po/ru.po index b0f6505a7..be94e2bfe 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" -"PO-Revision-Date: 2016-05-18 07:43+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" +"PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" "Language: ru\n" @@ -2825,9 +2825,12 @@ msgstr "" msgid "string used to show if mouse is enabled (bar item \"mouse_status\")" msgstr "" +#, fuzzy msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" -msgstr "" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" +msgstr "отображение маркера даты при смене дня" msgid "" "jump to previous buffer displayed when jumping to current buffer number " @@ -10714,16 +10717,3 @@ msgstr "%s нет аргумента для параметра \"%s\"\n" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: не могу соединиться с отправителем\n" - -#, fuzzy -#~ msgid "" -#~ "default part message (leaving channel) (\"%v\" will be replaced by " -#~ "WeeChat version in string)" -#~ msgstr "сообщение покидания канала ('%v' будет заменён на версию WeeChat)" - -#, fuzzy -#~ msgid "" -#~ "default quit message (disconnecting from server) (\"%v\" will be replaced " -#~ "by WeeChat version in string)" -#~ msgstr "" -#~ "сообщение о выходе по-умолчанию ('%v' будет заменён на версию WeeChat)" diff --git a/po/tr.po b/po/tr.po index b65870d83..fe0ce85cf 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -2536,7 +2536,9 @@ msgid "string used to show if mouse is enabled (bar item \"mouse_status\")" msgstr "" msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" msgid "" diff --git a/po/weechat.pot b/po/weechat.pot index 6f82b893a..144379a1f 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-08-30 18:33+0200\n" +"POT-Creation-Date: 2016-09-03 08:21+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -2533,7 +2533,9 @@ msgid "string used to show if mouse is enabled (bar item \"mouse_status\")" msgstr "" msgid "" -"time format for \"time\" bar item (see man strftime for date/time specifiers)" +"time format for \"time\" bar item (see man strftime for date/time " +"specifiers) (note: content is evaluated, so you can use colors with format " +"\"${color:xxx}\", see /help eval)" msgstr "" msgid "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index c1e50202b..35b67889e 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -37,6 +37,7 @@ #include "weechat.h" #include "wee-config.h" +#include "wee-eval.h" #include "wee-hashtable.h" #include "wee-hook.h" #include "wee-log.h" @@ -314,6 +315,7 @@ int config_word_chars_input_count = 0; char **config_nick_colors = NULL; int config_num_nick_colors = 0; struct t_hashtable *config_hashtable_nick_color_force = NULL; +char *config_item_time_evaluated = NULL; /* @@ -953,6 +955,49 @@ config_change_item_away (const void *pointer, void *data, gui_bar_item_update ("away"); } +/* + * Callback for changes on options "weechat.look.item_time_format". + */ + +void +config_change_item_time_format (const void *pointer, void *data, + struct t_config_option *option) +{ + /* make C compiler happy */ + (void) pointer; + (void) data; + (void) option; + + if (config_item_time_evaluated) + free (config_item_time_evaluated); + config_item_time_evaluated = eval_expression ( + CONFIG_STRING(config_look_item_time_format), NULL, NULL, NULL); + + config_change_buffer_content (NULL, NULL, NULL); +} + +/* + * Gets the current time formatted for the bar item status. + */ + +void +config_get_item_time (char *text_time, int max_length) +{ + time_t date; + struct tm *local_time; + + if (!config_item_time_evaluated) + config_change_item_time_format (NULL, NULL, NULL); + + text_time[0] = '\0'; + + date = time (NULL); + local_time = localtime (&date); + strftime (text_time, max_length, + config_item_time_evaluated, + local_time); +} + /* * Callback for changes on option "weechat.look.paste_bracketed". */ @@ -2948,10 +2993,11 @@ config_weechat_init_options () weechat_config_file, ptr_section, "item_time_format", "string", N_("time format for \"time\" bar item (see man strftime for date/time " - "specifiers)"), + "specifiers) (note: content is evaluated, so you can use colors " + "with format \"${color:xxx}\", see /help eval)"), NULL, 0, 0, "%H:%M", NULL, 0, NULL, NULL, NULL, - &config_change_buffer_content, NULL, NULL, + &config_change_item_time_format, NULL, NULL, NULL, NULL, NULL); config_look_jump_current_to_previous_buffer = config_file_new_option ( weechat_config_file, ptr_section, @@ -4509,4 +4555,10 @@ config_weechat_free () hashtable_free (config_hashtable_nick_color_force); config_hashtable_nick_color_force = NULL; } + + if (config_item_time_evaluated) + { + free (config_item_time_evaluated); + config_item_time_evaluated = NULL; + } } diff --git a/src/core/wee-config.h b/src/core/wee-config.h index e4c4a3d33..6682f25f1 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -358,6 +358,7 @@ extern int config_weechat_debug_set (const char *plugin_name, extern void config_weechat_debug_set_all (); extern int config_weechat_notify_set (struct t_gui_buffer *buffer, const char *notify); +extern void config_get_item_time (char *text_time, int max_length); extern int config_weechat_init (); extern int config_weechat_read (); extern int config_weechat_write (); diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index 980d9cbe1..372bac791 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "../core/weechat.h" #include "../core/wee-arraylist.h" @@ -980,8 +979,6 @@ gui_bar_item_time_cb (const void *pointer, void *data, struct t_gui_buffer *buffer, struct t_hashtable *extra_info) { - time_t date; - struct tm *local_time; char text_time[128], text_time2[128]; /* make C compiler happy */ @@ -992,11 +989,8 @@ gui_bar_item_time_cb (const void *pointer, void *data, (void) buffer; (void) extra_info; - date = time (NULL); - local_time = localtime (&date); - if (strftime (text_time, sizeof (text_time), - CONFIG_STRING(config_look_item_time_format), - local_time) == 0) + config_get_item_time (text_time, sizeof (text_time)); + if (!text_time[0]) return NULL; snprintf (text_time2, sizeof (text_time2), "%s%s", @@ -2017,8 +2011,6 @@ gui_bar_item_focus_buffer_nicklist_cb (const void *pointer, int gui_bar_item_timer_cb (const void *pointer, void *data, int remaining_calls) { - time_t date; - struct tm *local_time; static char item_time_text[128] = { '\0' }; char new_item_time_text[128]; @@ -2026,12 +2018,7 @@ gui_bar_item_timer_cb (const void *pointer, void *data, int remaining_calls) (void) data; (void) remaining_calls; - date = time (NULL); - local_time = localtime (&date); - if (strftime (new_item_time_text, sizeof (new_item_time_text), - CONFIG_STRING(config_look_item_time_format), - local_time) == 0) - return WEECHAT_RC_OK; + config_get_item_time (new_item_time_text, sizeof (new_item_time_text)); /* * we update item only if it changed since last time