core: set default value "djb2" for option weechat.look.nick_color_hash

2016-04-06 07:29:50 +02:00 · 2016-04-06 07:29:50 +02:00 · 5b62903772
parent fabd48cc6c
commit 5b62903772
9 changed files with 13 additions and 9 deletions
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@ -21,11 +21,12 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 [[1.5_features]]
 === New features

+* core: change default value of option weechat.look.nick_color_hash to "djb2"
 * core: fix nick coloring when stop chars and a forced color are used: first
  remove chars then look for forced color
 * 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
+  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
--- a/ReleaseNotes.asciidoc
+++ b/ReleaseNotes.asciidoc
@ -32,6 +32,9 @@ and you must set new value if you customized them:
 * 'irc.look.nick_color_hash' moved to 'weechat.look.nick_color_hash'
 * 'irc.look.nick_color_stop_chars' moved to 'weechat.look.nick_color_stop_chars'

+The default value for option 'weechat.look.nick_color_hash' is now `djb2`
+instead of `sum`.
+
 The following info names (used by API function "info_get") are renamed as well:

 * 'irc_nick_color' renamed to 'nick_color'
--- a/doc/de/autogen/user/weechat_options.asciidoc
+++ b/doc/de/autogen/user/weechat_options.asciidoc
@ -750,7 +750,7 @@
 * [[option_weechat.look.nick_color_hash]] *weechat.look.nick_color_hash*
 ** Beschreibung: `Gibt an welcher Hash-Algorithmus zur Farbauswahl für Nicks genutzt werden soll: djb2 = Variante des djb2 (Position der Buchstaben innerhalb des Nicks werden berücksichtigt: Anagramme eines Nick erhalten eine andere Farbe), sum = hier ist nur die Anzahl der Buchstaben maßgeblich`
 ** Typ: integer
-** Werte: djb2, sum (Standardwert: `sum`)
+** Werte: djb2, sum (Standardwert: `djb2`)

 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** Beschreibung: `Zeichen die genutzt werden sollen damit bei der Generierung der Farbe für einen Nicknamen abgebrochen wird. Es muss mindestens ein Zeichen im Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname lautet "|nick|abwesend" wobei das Zeichen "|" ignoriert werden soll. Die Farbe für den Nicknamen wird nun für "|nick" anstelle von "|nick|abwesend" erstellt)`
--- a/doc/en/autogen/user/weechat_options.asciidoc
+++ b/doc/en/autogen/user/weechat_options.asciidoc
@ -750,7 +750,7 @@
 * [[option_weechat.look.nick_color_hash]] *weechat.look.nick_color_hash*
 ** description: `hash algorithm used to find the color for a nick: djb2 = variant of djb2 (position of letters matters: anagrams of a nick have different color), sum = sum of letters`
 ** type: integer
-** values: djb2, sum (default value: `sum`)
+** values: djb2, sum (default value: `djb2`)

 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** description: `chars used to stop in nick when computing color with letters of nick (at least one char outside this list must be in string before stopping) (example: nick "|nick|away" with "|" in chars will return color of nick "|nick")`
--- a/doc/fr/autogen/user/weechat_options.asciidoc
+++ b/doc/fr/autogen/user/weechat_options.asciidoc
@ -750,7 +750,7 @@
 * [[option_weechat.look.nick_color_hash]] *weechat.look.nick_color_hash*
 ** description: `algorithme de hash utilisé pour trouver la couleur du pseudo : djb2 = variante de djb2 (la position des lettres compte : les anagrammes d'un pseudo ont une couleur différente), sum = somme des lettres`
 ** type: entier
-** valeurs: djb2, sum (valeur par défaut: `sum`)
+** valeurs: djb2, sum (valeur par défaut: `djb2`)

 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** description: `caractères utilisés pour l'arrêt dans le pseudo lors du calcul de la couleur avec les lettres du pseudo (au moins un caractère en dehors de cette liste doit être dans la chaîne avant de s'arrêter) (exemple : le pseudo "|nick|away" avec "|" dans les caractères retournera la couleur du pseudo "|nick")`
--- a/doc/it/autogen/user/weechat_options.asciidoc
+++ b/doc/it/autogen/user/weechat_options.asciidoc
@ -750,7 +750,7 @@
 * [[option_weechat.look.nick_color_hash]] *weechat.look.nick_color_hash*
 ** descrizione: `hash algorithm used to find the color for a nick: djb2 = variant of djb2 (position of letters matters: anagrams of a nick have different color), sum = sum of letters`
 ** tipo: intero
-** valori: djb2, sum (valore predefinito: `sum`)
+** valori: djb2, sum (valore predefinito: `djb2`)

 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** descrizione: `caratteri usati per interrompere il calcolo del colore con le lettere del nick (almeno un carattere al di fuori di questa lista deve essere nella lista prima di interromperlo) (esempio: nick "|nick|away" con "|" nei caratteri restituisce il colore del nick "|nick")`
--- a/doc/ja/autogen/user/weechat_options.asciidoc
+++ b/doc/ja/autogen/user/weechat_options.asciidoc
@ -750,7 +750,7 @@
 * [[option_weechat.look.nick_color_hash]] *weechat.look.nick_color_hash*
 ** 説明: `ニックネームに対する色を見つけるハッシュアルゴリズム: djb2 = djb2 (文字の位置が重要: ニックネームに同じ色が使われにくくなる) の亜種、sum = 文字の総和`
 ** タイプ: 整数
-** 値: djb2, sum (デフォルト値: `sum`)
+** 値: djb2, sum (デフォルト値: `djb2`)

 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** 説明: `ニックネーム内の色計算に使用する部分を制限する文字 (このリストに含まれない文字が、このリストの文字の前に少なくとも一つ以上含まれなければいけない) (例: "|" を設定した場合、"|nick|away" はニックネーム "|nick" と同じ色になる)`
--- a/doc/pl/autogen/user/weechat_options.asciidoc
+++ b/doc/pl/autogen/user/weechat_options.asciidoc
@ -750,7 +750,7 @@
 * [[option_weechat.look.nick_color_hash]] *weechat.look.nick_color_hash*
 ** opis: `algorytm haszujący używany do znalezienia koloru dla nicka: djb2 = odmiana djb2 (pozycja liter ma znaczenie: anagramy nicka mają różne kolory), sum = suma liter`
 ** typ: liczba
-** wartości: djb2, sum (domyślna wartość: `sum`)
+** wartości: djb2, sum (domyślna wartość: `djb2`)

 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** opis: `znaki używane do zatrzymania odczytywania koloru nicka (przynajmniej jeden znak poza tą listą musi się znajdować przed zatrzymaniem) (przykład: nick "|nick|away" ze znakami "|" zwróci kolor nicka "|nick")`
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@ -3022,7 +3022,7 @@ config_weechat_init_options ()
        N_("hash algorithm used to find the color for a nick: djb2 = variant "
           "of djb2 (position of letters matters: anagrams of a nick have "
           "different color), sum = sum of letters"),
-        "djb2|sum", 0, 0, "sum", NULL, 0,
+        "djb2|sum", 0, 0, "djb2", NULL, 0,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
    config_look_nick_color_stop_chars = config_file_new_option (
        weechat_config_file, ptr_section,