core: display a more explicit error when a filter fails to be added (closes #522)

This commit is contained in:
Sébastien Helleu 2015-09-09 09:22:40 +02:00
parent 145ec0db35
commit 8688c48e42
15 changed files with 319 additions and 139 deletions

View File

@ -19,6 +19,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
=== New features
* core: display a more explicit error when a filter fails to be added
(issue #522)
* api: add function string_hex_dump()
* api: add argument "length" in function utf8_is_valid()
* irc: add command /cap (issue #8)

View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-08-15 22:22+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: cs\n"
@ -437,10 +437,6 @@ msgstr "%sChyba: filtr \"%s\" nenalezen"
msgid "Filter \"%s\" disabled"
msgstr "Filtr \"%s\" zakázán"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sChyba: filtr \"%s\" již existuje"
#, fuzzy, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr "%sChyba: musíte specifikovat buď tag(y) nebo regulární výrazpro filter"
@ -449,10 +445,6 @@ msgstr "%sChyba: musíte specifikovat buď tag(y) nebo regulární výrazpro fil
msgid "Filter \"%s\" added:"
msgstr "Filtr \"%s\" přidán:"
#, c-format
msgid "%sError adding filter"
msgstr "%sChyba: přidávání filtru"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "Filtr \"%s\" přejmenován na \"%s\""
@ -4378,6 +4370,27 @@ msgstr[2] "normálních"
msgid "Debug disabled for cursor mode"
msgstr "Ladění vypnuto pro \"%s\""
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sChyba: přidávání filtru"
#, fuzzy
msgid "not enough arguments"
msgstr "%sNedostatek paměti"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%sChyba: buffer se stejným jménem (%s) už existuje"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s%s: \"%s\" není validní regulární výraz (%s)"
#, fuzzy
msgid "not enough memory"
msgstr "%sNedostatek paměti"
#, fuzzy, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Nová klávesová zkratka: %s%s => %s%s"

View File

@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-08-24 11:25+0100\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <>\n"
"Language: de_DE\n"
@ -457,10 +457,6 @@ msgstr "%sFehler: Filter \"%s\" nicht gefunden"
msgid "Filter \"%s\" disabled"
msgstr "Filter \"%s\" deaktiviert"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sFehler: Filter \"%s\" existiert bereits"
#, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -471,10 +467,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "Filter \"%s\" hinzugefügt:"
#, c-format
msgid "%sError adding filter"
msgstr "%sFehler beim Hinzufügen eines Filters"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "Filter \"%s\" wurde umbenannt. Der neue Name lautet \"%s\""
@ -5162,6 +5154,27 @@ msgstr[1] "normale"
msgid "Debug disabled for cursor mode"
msgstr "Debug für Cursor Modus deaktiviert"
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sFehler beim Hinzufügen eines Filters"
#, fuzzy
msgid "not enough arguments"
msgstr "%sNicht genügend Speicher"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%sFehler: Ein Buffer mit dem selben Namen (%s) existiert bereits"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s%s: \"%s\" ist kein korrekter regulärer Ausdruck (%s)"
#, fuzzy
msgid "not enough memory"
msgstr "%sNicht genügend Speicher"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Neue Tastenbelegung (Kontext \"%s\"): %s%s => %s%s"

View File

@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-07-26 09:41+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: es\n"
@ -427,10 +427,6 @@ msgstr "%sError: filtro \"%s\" no encontrado"
msgid "Filter \"%s\" disabled"
msgstr "Filtro \"%s\" desactivado"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sError: el filtro \"%s\" ya existe"
#, fuzzy, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -441,10 +437,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "Filtro \"%s\" añadido:"
#, c-format
msgid "%sError adding filter"
msgstr "%sError al agregar el filtro"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "Filtro \"%s\" renombrado a \"%s\""
@ -4584,6 +4576,27 @@ msgstr[1] "normales"
msgid "Debug disabled for cursor mode"
msgstr "Depurado para el modo cursor desactivado"
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sError al agregar el filtro"
#, fuzzy
msgid "not enough arguments"
msgstr "%sNo hay suficiente memoria"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%sError: un buffer con el mismo nombre (%s) ya existe"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s%s: \"%s\" no es una expresión regular válida (%s)"
#, fuzzy
msgid "not enough memory"
msgstr "%sNo hay suficiente memoria"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Nuevo atajo (contexto \"%s\"): %s%s => %s%s"

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-08-24 13:25+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:15+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@ -441,10 +441,6 @@ msgstr "%sErreur : filtre \"%s\" non trouvé"
msgid "Filter \"%s\" disabled"
msgstr "Filtre \"%s\" désactivé"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sErreur : le filtre \"%s\" existe déjà"
#, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -455,10 +451,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "Filtre \"%s\" ajouté :"
#, c-format
msgid "%sError adding filter"
msgstr "%sErreur d'ajout du filtre"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "Filtre \"%s\" renommé en \"%s\""
@ -5050,6 +5042,24 @@ msgstr[1] "normaux"
msgid "Debug disabled for cursor mode"
msgstr "Debug désactivé pour le mode curseur"
#, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sErreur d'ajout du filtre \"%s\" : %s"
msgid "not enough arguments"
msgstr "pas assez de paramètres"
msgid "a filter with same name already exists"
msgstr "un filtre avec le même nom existe déjà"
#. TRANSLATORS: %s is the error returned by regerror
#, c-format
msgid "invalid regular expression (%s)"
msgstr "expression régulière invalide (%s)"
msgid "not enough memory"
msgstr "pas assez de mémoire"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Nouvelle touche (contexte \"%s\") : %s%s => %s%s"

View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-07-26 09:42+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: hu\n"
@ -430,10 +430,6 @@ msgstr "%s a \"%s\" modul nem található\n"
msgid "Filter \"%s\" disabled"
msgstr "a felhasználók le lettek tiltva"
#, fuzzy, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%s az ignore már létezik\n"
#, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -442,10 +438,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "a felhasználók le lettek tiltva"
#, fuzzy, c-format
msgid "%sError adding filter"
msgstr "%s helytelen pufferszám\n"
#, fuzzy, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "a felhasználók le lettek tiltva"
@ -3977,6 +3969,27 @@ msgstr[1] "normál"
msgid "Debug disabled for cursor mode"
msgstr ""
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%s helytelen pufferszám\n"
#, fuzzy
msgid "not enough arguments"
msgstr "Nincs elég memória az új sorhoz\n"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%s nem sikerült a \"%s\" modult betölteni: már van ilyen nevű modul\n"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s a(z) \"%s\" érvénytelen reguláris kifejezés (%s)\n"
#, fuzzy
msgid "not enough memory"
msgstr "Nincs elég memória az új sorhoz\n"
#, fuzzy, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Új billentyűparancs: %s"

View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-07-26 09:42+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: it\n"
@ -418,10 +418,6 @@ msgstr "%sErrore: filtro \"%s\" non trovato"
msgid "Filter \"%s\" disabled"
msgstr "Filtro \"%s\" disabilitato"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sErrore: il filtro \"%s\" esiste già"
#, fuzzy, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr "%sErrore: specificare almeno un tag o una regex per il filtro"
@ -430,10 +426,6 @@ msgstr "%sErrore: specificare almeno un tag o una regex per il filtro"
msgid "Filter \"%s\" added:"
msgstr "Filtro \"%s\" aggiunto:"
#, c-format
msgid "%sError adding filter"
msgstr "%sErrore nell'aggiunta del fitro"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "Filtro \"%s\" rinominato in \"%s\""
@ -4717,6 +4709,27 @@ msgstr[1] "normali"
msgid "Debug disabled for cursor mode"
msgstr "Debug disabilitato per la modalità cursore"
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sErrore nell'aggiunta del fitro"
#, fuzzy
msgid "not enough arguments"
msgstr "%sSpazio non sufficiente"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%sErrore: un buffer con lo stesso nome (%s) esiste già"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s%s: \"%s\" non è una espressione regolare valida (%s)"
#, fuzzy
msgid "not enough memory"
msgstr "%sSpazio non sufficiente"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Nuova combinazione tasti (contesto \"%s\"): %s%s => %s%s"

View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-08-26 09:00+0900\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
"Language: ja\n"
@ -436,10 +436,6 @@ msgstr "%sエラー: フィルタ \"%s\" が見つかりません"
msgid "Filter \"%s\" disabled"
msgstr "フィルタ \"%s\" が無効化されました"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sエラー: フィルタ \"%s\" は既に存在します"
#, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr "%sエラー: フィルタ用にタグか正規表現のどちらかを指定してください"
@ -448,10 +444,6 @@ msgstr "%sエラー: フィルタ用にタグか正規表現のどちらかを
msgid "Filter \"%s\" added:"
msgstr "フィルタ \"%s\" が追加されました:"
#, c-format
msgid "%sError adding filter"
msgstr "%sフィルタの追加エラー"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "フィルタ \"%s\" の名前を \"%s\" に変更しました"
@ -4824,6 +4816,27 @@ msgstr[0] "通常"
msgid "Debug disabled for cursor mode"
msgstr "カーソルモードのデバッグを無効化"
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sフィルタの追加エラー"
#, fuzzy
msgid "not enough arguments"
msgstr "%sメモリ不足"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%sエラー: 同じ名前 (%s) のバッファがあります"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s%s: \"%s\" は不正な正規表現です (%s)"
#, fuzzy
msgid "not enough memory"
msgstr "%sメモリ不足"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "新しいキー割り当て (コンテキスト \"%s\"): %s%s => %s%s"

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-08-14 17:54+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: pl\n"
@ -440,10 +440,6 @@ msgstr "%sBłąd: nie odnaleziono filtru \"%s\""
msgid "Filter \"%s\" disabled"
msgstr "Filtr \"%s\" wyłączony"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sBłąd: filtr \"%s\" już istnieje"
#, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -453,10 +449,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "Dodano filtr \"%s\":"
#, c-format
msgid "%sError adding filter"
msgstr "%sBłąd podczas dodawania filtru"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "Zmieniono nazwę filtru z \"%s\" na \"%s\""
@ -4941,6 +4933,27 @@ msgstr[2] "normalnych"
msgid "Debug disabled for cursor mode"
msgstr "Debugowanie wyłączone dla trybu kursora"
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sBłąd podczas dodawania filtru"
#, fuzzy
msgid "not enough arguments"
msgstr "%sZa mało pamięci"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%sBłąd: istnieje już bufor o nazwie (%s)"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s%s: \"%s\" nie jest prawidłowym wyrażeniem regularnym (%s)"
#, fuzzy
msgid "not enough memory"
msgstr "%sZa mało pamięci"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Nowy skrót klawiszowy (kontekst: \"%s\"): %s%s => %s%s"

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-07-26 09:42+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: pt_BR\n"
@ -451,10 +451,6 @@ msgstr "%sErro: filtro \"%s\" não encontrado"
msgid "Filter \"%s\" disabled"
msgstr "Filtro \"%s\" desabilitado"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%sErro: filtro \"%s\" já existe"
#, fuzzy, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -465,10 +461,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "Filtro \"%s\" adicionado:"
#, c-format
msgid "%sError adding filter"
msgstr "%sErro ao adicionar filtro"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "Filtro \"%s\" renomeado para \"%s\""
@ -4570,6 +4562,27 @@ msgstr[1] "normais"
msgid "Debug disabled for cursor mode"
msgstr "Depuração desabilitada para modo cursor"
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sErro ao adicionar filtro"
#, fuzzy
msgid "not enough arguments"
msgstr "%sMemória insuficiente"
#, fuzzy
msgid "a filter with same name already exists"
msgstr "%sErro: um buffer com o mesmo nome (%s) já existe"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s%s: erro ao compilar expressão regular \"%s\""
#, fuzzy
msgid "not enough memory"
msgstr "%sMemória insuficiente"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Novo atalho de teclado (contexto \"%s\"): %s%s => %s%s"

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"PO-Revision-Date: 2015-07-26 09:42+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-09-09 09:13+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: ru\n"
@ -439,10 +439,6 @@ msgstr "%s plugin \"%s\" не найден\n"
msgid "Filter \"%s\" disabled"
msgstr "команда users отключена"
#, fuzzy, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr "%s игнорирование уже существует\n"
#, fuzzy, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -452,10 +448,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "команда users отключена"
#, fuzzy, c-format
msgid "%sError adding filter"
msgstr "%s неправильный номер буфера\n"
#, fuzzy, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr "команда users отключена"
@ -4015,6 +4007,28 @@ msgstr[2] "обычные"
msgid "Debug disabled for cursor mode"
msgstr ""
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%s неправильный номер буфера\n"
#, fuzzy
msgid "not enough arguments"
msgstr "Недостаточно памяти для новой строчки\n"
#, fuzzy
msgid "a filter with same name already exists"
msgstr ""
"%s не могу загрузить plugin \"%s\": одноимённый plugin уже существует\n"
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%s \"%s\" не является регулярным выражением (%s)\n"
#, fuzzy
msgid "not enough memory"
msgstr "Недостаточно памяти для новой строчки\n"
#, fuzzy, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr "Новая комбинация клавиш: %s"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2015-03-10 21:33+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -390,10 +390,6 @@ msgstr "%sHata: filtre \"%s\" bulunamadı"
msgid "Filter \"%s\" disabled"
msgstr "Filtre \"%s\" devre dışı"
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr ""
#, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -402,10 +398,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr "Filtre \"%s\" eklendi:"
#, c-format
msgid "%sError adding filter"
msgstr "%sFiltre eklenirken hata"
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr ""
@ -3599,6 +3591,26 @@ msgstr[0] ""
msgid "Debug disabled for cursor mode"
msgstr ""
#, fuzzy, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr "%sFiltre eklenirken hata"
#, fuzzy
msgid "not enough arguments"
msgstr "%sYeterli bellek yok"
msgid "a filter with same name already exists"
msgstr ""
#. TRANSLATORS: %s is the error returned by regerror
#, fuzzy, c-format
msgid "invalid regular expression (%s)"
msgstr "%sHata: dosya \"%s\" oluşturulamaz"
#, fuzzy
msgid "not enough memory"
msgstr "%sYeterli bellek yok"
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr ""

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-08-24 13:25+0200\n"
"POT-Creation-Date: 2015-09-09 09:16+0200\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -387,10 +387,6 @@ msgstr ""
msgid "Filter \"%s\" disabled"
msgstr ""
#, c-format
msgid "%sError: filter \"%s\" already exists"
msgstr ""
#, c-format
msgid "%sError: you must specify at least tags or regex for filter"
msgstr ""
@ -399,10 +395,6 @@ msgstr ""
msgid "Filter \"%s\" added:"
msgstr ""
#, c-format
msgid "%sError adding filter"
msgstr ""
#, c-format
msgid "Filter \"%s\" renamed to \"%s\""
msgstr ""
@ -3595,6 +3587,24 @@ msgstr[1] ""
msgid "Debug disabled for cursor mode"
msgstr ""
#, c-format
msgid "%sError adding filter \"%s\": %s"
msgstr ""
msgid "not enough arguments"
msgstr ""
msgid "a filter with same name already exists"
msgstr ""
#. TRANSLATORS: %s is the error returned by regerror
#, c-format
msgid "invalid regular expression (%s)"
msgstr ""
msgid "not enough memory"
msgstr ""
#, c-format
msgid "New key binding (context \"%s\"): %s%s => %s%s"
msgstr ""

View File

@ -2184,14 +2184,6 @@ COMMAND_CALLBACK(filter)
if (string_strcasecmp (argv[1], "add") == 0)
{
COMMAND_MIN_ARGS(6, "add");
if (gui_filter_search_by_name (argv[2]))
{
gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
_("%sError: filter \"%s\" already exists"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
argv[2]);
return WEECHAT_RC_OK;
}
if ((strcmp (argv[4], "*") == 0) && (strcmp (argv_eol[5], "*") == 0))
{
gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
@ -2201,7 +2193,8 @@ COMMAND_CALLBACK(filter)
return WEECHAT_RC_OK;
}
ptr_filter = gui_filter_new (1, argv[2], argv[3], argv[4], argv_eol[5]);
ptr_filter = gui_filter_new (1, argv[2], argv[3], argv[4],
argv_eol[5]);
if (ptr_filter)
{
gui_filter_all_buffers ();
@ -2211,12 +2204,6 @@ COMMAND_CALLBACK(filter)
argv[2]);
command_filter_display (ptr_filter);
}
else
{
gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
_("%sError adding filter"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
}
return WEECHAT_RC_OK;
}

View File

@ -38,6 +38,7 @@
#include "../plugins/plugin.h"
#include "gui-filter.h"
#include "gui-buffer.h"
#include "gui-chat.h"
#include "gui-line.h"
#include "gui-window.h"
@ -253,6 +254,21 @@ gui_filter_search_by_name (const char *name)
return NULL;
}
/*
* Displays an error when a new filter is created.
*/
void
gui_filter_new_error (const char *name, const char *error)
{
gui_chat_printf_date_tags (
NULL, 0, GUI_FILTER_TAG_NO_FILTER,
_("%sError adding filter \"%s\": %s"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
(name) ? name : "",
error);
}
/*
* Creates a new filter.
*
@ -265,15 +281,22 @@ gui_filter_new (int enabled, const char *name, const char *buffer_name,
{
struct t_gui_filter *new_filter;
regex_t *regex1, *regex2;
char *pos_tab, *regex_prefix, **tags_array;
char *pos_tab, *regex_prefix, **tags_array, buf[512], str_error[512];
const char *ptr_start_regex, *pos_regex_message;
int i;
int i, rc;
if (!name || !buffer_name || !tags || !regex)
{
gui_filter_new_error (name, _("not enough arguments"));
return NULL;
}
if (gui_filter_search_by_name (name))
{
gui_filter_new_error (name,
_("a filter with same name already exists"));
return NULL;
}
ptr_start_regex = regex;
if ((ptr_start_regex[0] == '!')
@ -305,9 +328,16 @@ gui_filter_new (int enabled, const char *name, const char *buffer_name,
regex1 = malloc (sizeof (*regex1));
if (regex1)
{
if (string_regcomp (regex1, regex_prefix,
REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
rc = string_regcomp (regex1, regex_prefix,
REG_EXTENDED | REG_ICASE | REG_NOSUB);
if (rc != 0)
{
regerror (rc, regex1, buf, sizeof (buf));
snprintf (str_error, sizeof (str_error),
/* TRANSLATORS: %s is the error returned by regerror */
_("invalid regular expression (%s)"),
buf);
gui_filter_new_error (name, str_error);
free (regex_prefix);
free (regex1);
return NULL;
@ -320,9 +350,16 @@ gui_filter_new (int enabled, const char *name, const char *buffer_name,
regex2 = malloc (sizeof (*regex2));
if (regex2)
{
if (string_regcomp (regex2, pos_regex_message,
REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
rc = string_regcomp (regex2, pos_regex_message,
REG_EXTENDED | REG_ICASE | REG_NOSUB);
if (rc != 0)
{
regerror (rc, regex2, buf, sizeof (buf));
snprintf (str_error, sizeof (str_error),
/* TRANSLATORS: %s is the error returned by regerror */
_("invalid regular expression (%s)"),
buf);
gui_filter_new_error (name, str_error);
if (regex_prefix)
free (regex_prefix);
if (regex1)
@ -390,6 +427,10 @@ gui_filter_new (int enabled, const char *name, const char *buffer_name,
(void) hook_signal_send ("filter_added",
WEECHAT_HOOK_SIGNAL_POINTER, new_filter);
}
else
{
gui_filter_new_error (name, _("not enough memory"));
}
return new_filter;
}