Re: syntax/diff.vim minor bug and locale problem

Wed, 04 Aug 2010 05:13:00 -0700 

On Wed, Aug 4, 2010 at 8:20 AM, Bram Moolenaar <[email protected]> wrote:
>
> Jakson A. Aquino wrote:
>
>> >> When running diff without options, removed lines are separated of
>> >> added ones by '^---$'. This pattern gets interpreted as diffRemoved
>> >> when it is not. I think the pattern can be classified as diffLine. If
>> >> I'm not interpreting it wrongly the attached patch fix this tiny bug.
>> >
>> > Yeah, diffRemoved is not right, I'll include the change.
>> >
>> >> Locale problem: The diff in languages other than English may generate
>> >> output that doesn't match the patterns for diffOnly, diffDiffer, etc.
>> >> because diff messages get translated in some languages. To fix this
>> >> for my locale (pt_BR.UTF-8) I've put in my
>> >> ~/.vim/after/syntax/diff.vim the following lines:
>> >>
>> >> syn match diffOnly      "^[A-Z].*"
>> >> syn match diffIdentical "^[A-Z].*"
>> >> syn match diffDiffer    "^[A-Z].*"
>> >> syn match diffBDiffer   "^[A-Z].*"
>> >> syn match diffIsA       "^[A-Z].*"
>> >> syn match diffNoEOL     "^[A-Z].*"
>> >> syn match diffCommon    "^[A-Z].*"
>> >>
>> >> I repeated the same pattern because sometimes I use the terminal
>> >> emulator in English and the above patterns will still be fine. A more
>> >> general solution would be to define the above syntax elements first
>> >> using the pattern "^\S.*" and, then, define the other syntax elements.
>> >> This approach would have at least one shortcoming: the distinction
>> >> between diffOnly, diffidentical, etc. would be lost.
>> >
>> > But using the same pattern will mean one of them wins, you can leave out
>> > all the others.
>> >
>> > I think the only real solution would be to include the translations.
>> > I found the German one, but most others result in English for me.
>> >
>> > syn match diffOnly      "^Only in .*"
>> > syn match diffOnly      "^Nur in .*"
>>
>> One problem of using translations is that it will be necessary to
>> track them because they may change. For example, "apenas" and
>> "somente" are both Portuguese translations for "only". The first one
>> is used in Ubuntu 10.04 and the second in Debian unstable. Ubuntu and
>> Debian currently carry different versions of the package diffutils. I
>> wrote the script getStrings.sh to automatically get the strings out of
>> .po files. Then I manually edited the output with Vim and added the
>> result to syntax/diff.vim. For Portuguese, I manually added the other
>> translation to "Only". Were you thinking in something like this? I
>> retrieved the translations of the attached diff.vim from the Debian
>> unstable package of diffutils (version 3.0). There are translations
>> for the following locales:
>>
>> ca cs da de el eo es fi fr ga gl he hu id it ja lv ms nl pl pt_BR ro
>> ru sr sv tr uk vi zh_CN zh_TW
>>
>> I attached the getStrings and vim.diff files.
>
> I don't know what others think, but I kind of like it.
>
> The patterns need to start with "^" to make them match only at the start
> of the line.
>
> There are a few duplicates, e.g., between China and Taiwan.

I also found one duplicate between locales "id" and "ms". I fixed it.

> This will only work in utf-8.  Using scriptencoding and an "if" should
> work, like what's done in syntax/tex.vim.

Added.

> If you can fix this I think I should include it.

The patch to syntax/diff.vim is attached. I also attached the
getStrings.sh again because I added a few lines of code to find
duplicated lines in the difftranslations.vim.

Best regards,

Jakson

-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

Attachment: getStrings.sh
Description: Bourne shell script

diff -r 734196b073e0 runtime/syntax/diff.vim
--- a/runtime/syntax/diff.vim	Wed Aug 04 12:39:44 2010 +0200
+++ b/runtime/syntax/diff.vim	Wed Aug 04 09:05:30 2010 -0300
@@ -7,6 +7,7 @@
 if exists("b:current_syntax")
   finish
 endif
+scriptencoding utf-8
 
 syn match diffOnly	"^Only in .*"
 syn match diffIdentical	"^Files .* and .* are identical$"
@@ -16,8 +17,274 @@
 syn match diffNoEOL	"^No newline at end of file .*"
 syn match diffCommon	"^Common subdirectories: .*"
 
-" German
-syn match diffOnly	"^Nur in .*"
+" ca
+syn match diffOnly	"^Només a .*: .*$"
+syn match diffIdentical	"^Els fitxers .* i .* són idèntics$"
+syn match diffDiffer	"^Els fitxers .* i .* difereixen$"
+syn match diffBDiffer	"^Els fitxers .* i .* difereixen$"
+syn match diffIsA	"^El fitxer .* és un .* mentre que el fitxer .* és un .*$"
+syn match diffNoEOL	"^No hi ha cap caràcter de salt de línia al final del fitxer"
+syn match diffCommon	"^Subdirectoris comuns: .* i .*$"
+
+" cs
+syn match diffOnly	"^Pouze v .*: .*$"
+syn match diffIdentical	"^Soubory .* a .* jsou identické$"
+syn match diffDiffer	"^Soubory .* a .* jsou různé$"
+syn match diffBDiffer	"^Soubory .* a .* jsou různé$"
+syn match diffIsA	"^Soubor .* je .* pokud soubor .* je .*$"
+syn match diffNoEOL	"^Chybí znak konce řádku na konci souboru"
+syn match diffCommon	"^Společné podadresáře: .* a .*$"
+
+" da
+syn match diffOnly	"^Kun i .*: .*$"
+syn match diffIdentical	"^Filerne .* og .* er identiske$"
+syn match diffDiffer	"^Filerne .* og .* er forskellige$"
+syn match diffBDiffer	"^Binære filer .* og .* er forskellige$"
+syn match diffIsA	"^Filen .* er en .* mens filen .* er en .*$"
+syn match diffNoEOL	"^Intet linjeskift ved filafslutning"
+syn match diffCommon	"^Identiske underkataloger: .* og .*$"
+
+" de
+syn match diffOnly	"^Nur in .*: .*.$"
+syn match diffIdentical	"^Dateien .* und .* sind identisch.$"
+syn match diffDiffer	"^Dateien .* und .* sind verschieden.$"
+syn match diffBDiffer	"^Binärdateien .* and .* sind verschieden.$"
+syn match diffIsA	"^Datei .* ist ein .* während Datei .* ein .* ist.$"
+syn match diffNoEOL	"^Kein Zeilenumbruch am Dateiende."
+syn match diffCommon	"^Gemeinsame Unterverzeichnisse: .* und .*.$"
+
+" el
+syn match diffOnly	"^Μόνο στο .*: .*$"
+syn match diffIdentical	"^Τα αρχεία .* καί .* είναι πανομοιότυπα$"
+syn match diffDiffer	"^Τα αρχεία .* και .* διαφέρουν$"
+syn match diffBDiffer	"^Τα αρχεία .* και .* διαφέρουν$"
+syn match diffIsA	"^Το αρχείο .* είναι .* ενώ το αρχείο .* είναι .*$"
+syn match diffNoEOL	"^Δεν υπάρχει χαρακτήρας νέας γραμμής στο τέλος του αρχείου"
+syn match diffCommon	"^Οι υποκατάλογοι .* και .* είναι ταυτόσημοι$"
+
+" eo
+syn match diffOnly	"^Nur en .*: .*$"
+syn match diffIdentical	"^Dosieroj .* kaj .* estas samaj$"
+syn match diffDiffer	"^Dosieroj .* kaj .* estas malsamaj$"
+syn match diffBDiffer	"^Dosieroj .* kaj .* estas malsamaj$"
+syn match diffIsA	"^Dosiero .* estas .*, dum dosiero .* estas .*$"
+syn match diffNoEOL	"^Mankas linifino ĉe fino de dosiero"
+syn match diffCommon	"^Komunaj subdosierujoj: .* kaj .*$"
+
+" es
+syn match diffOnly	"^Sólo en .*: .*$"
+syn match diffIdentical	"^Los ficheros .* y .* son idénticos$"
+syn match diffDiffer	"^Los ficheros .* y .* son distintos$"
+syn match diffBDiffer	"^Los ficheros binarios .* y .* son distintos$"
+syn match diffIsA	"^El fichero .* es un .* mientras que el .* es un .*$"
+syn match diffNoEOL	"^No hay ningún carácter de nueva línea al final del fichero"
+syn match diffCommon	"^Subdirectorios comunes: .* y .*$"
+
+" fi
+syn match diffOnly	"^Vain hakemistossa .*: .*$"
+syn match diffIdentical	"^Tiedostot .* ja .* ovat identtiset$"
+syn match diffDiffer	"^Tiedostot .* ja .* eroavat$"
+syn match diffBDiffer	"^Binääritiedostot .* ja .* eroavat$"
+syn match diffIsA	"^Tiedosto .* on .*, kun taas tiedosto .* on .*$"
+syn match diffNoEOL	"^Ei rivinvaihtoa tiedoston lopussa"
+syn match diffCommon	"^Yhteiset alihakemistot: .* ja .*$"
+
+" fr
+syn match diffOnly	"^Seulement dans .*: .*$"
+syn match diffIdentical	"^Les fichiers .* et .* sont identiques.$"
+syn match diffDiffer	"^Les fichiers .* et .* sont différents.$"
+syn match diffBDiffer	"^Les fichiers binaires .* et .* sont différents.$"
+syn match diffIsA	"^Le fichier .* est un .* alors que le fichier .* est un .*$"
+syn match diffNoEOL	"^Pas de fin de ligne à la fin du fichier."
+syn match diffCommon	"^Les sous-répertoires .* et .* sont identiques.$"
+
+" ga
+syn match diffOnly	"^I .* amháin: .*$"
+syn match diffIdentical	"^Is comhionann iad na comhaid .* agus .*$"
+syn match diffDiffer	"^Tá difríocht idir na comhaid .* agus .*$"
+syn match diffBDiffer	"^Tá difríocht idir na comhaid .* agus .*$"
+syn match diffIsA	"^Tá comhad .* ina .* ach tá comhad .* ina .*$"
+syn match diffNoEOL	"^Gan líne nua ag an chomhadchríoch"
+syn match diffCommon	"^Fochomhadlanna i gcoitianta: .* agus .*$"
+
+" gl
+syn match diffOnly	"^Só en .*: .*$"
+syn match diffIdentical	"^Os ficheiros .* e .* son idénticos$"
+syn match diffDiffer	"^Os ficheiros .* e .* son diferentes$"
+syn match diffBDiffer	"^Os ficheiros binarios .* e .* son diferentes$"
+syn match diffIsA	"^O ficheiro .* é un .* mentres que o ficheiro .* é un .*$"
+syn match diffNoEOL	"^Non hai un salto de liña na fin da liña"
+syn match diffCommon	"^Subdirectorios comúns: .* e .*$"
+
+" he
+syn match diffOnly	"^.*-ב קר אצמנ .*$"
+syn match diffIdentical	"^םיהז םניה .*-ו .* םיצבקה$"
+syn match diffDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיצבקה$"
+syn match diffBDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיירניב םיצבק$"
+syn match diffIsA	"^.* .*-ל .* .* תוושהל ןתינ אל$"
+syn match diffNoEOL	"^ץבוקה ףוסב השדח-הרוש ות רסח"
+syn match diffCommon	"^.*-ו .* :תוהז תויקית-תת$"
+
+" hu
+syn match diffOnly	"^Csak .* -ben: .*$"
+syn match diffIdentical	"^.* és .* fájlok azonosak$"
+syn match diffDiffer	"^A(z) .* és a(z) .* fájlok különböznek$"
+syn match diffBDiffer	"^A(z) .* és a(z) .* fájlok különböznek$"
+syn match diffIsA	"^A(z) .* fájl egy .*, viszont a(z) .* fájl egy .*$"
+syn match diffNoEOL	"^Nincs újsor a fájl végén"
+syn match diffCommon	"^Közös alkönyvtárak: .* és .*$"
+
+" id
+syn match diffOnly	"^Hanya dalam .*: .*$"
+syn match diffIdentical	"^File .* dan .* identik$"
+syn match diffDiffer	"^Berkas .* dan .* berbeda$"
+syn match diffBDiffer	"^File biner .* dan .* berbeda$"
+syn match diffIsA	"^File .* adalah .* sementara file .* adalah .*$"
+syn match diffNoEOL	"^Tidak ada baris-baru di akhir dari berkas"
+syn match diffCommon	"^Subdirektori sama: .* dan .*$"
+
+" it
+syn match diffOnly	"^Solo in .*: .*$"
+syn match diffIdentical	"^I file .* e .* sono identici$"
+syn match diffDiffer	"^I file .* e .* sono diversi$"
+syn match diffBDiffer	"^I file .* e .* sono diversi$"
+syn match diffIsA	"^File .* è un .* mentre file .* è un .*$"
+syn match diffNoEOL	"^Manca newline alla fine del file"
+syn match diffCommon	"^Sottodirectory in comune: .* e .*$"
+
+" ja
+syn match diffOnly	"^.*だけに発見: .*$"
+syn match diffIdentical	"^ファイル.*と.*は同一$"
+syn match diffDiffer	"^ファイル.*と.*は違います$"
+syn match diffBDiffer	"^バイナリー・ファイル.*と.*は違います$"
+syn match diffIsA	"^ファイル.*は.*、ファイル.*は.*$"
+syn match diffNoEOL	"^ファイル末尾に改行がありません"
+syn match diffCommon	"^共通の下位ディレクトリー: .*と.*$"
+
+" lv
+syn match diffOnly	"^Tikai iekš .*: .*$"
+syn match diffIdentical	"^Fails .* un .* ir identiski$"
+syn match diffDiffer	"^Faili .* un .* atšķiras$"
+syn match diffBDiffer	"^Faili .* un .* atšķiras$"
+syn match diffIsA	"^Fails .* ir .* kamēr fails .* ir .*$"
+syn match diffNoEOL	"^Nav jaunu rindu faila beigās"
+syn match diffCommon	"^Kopējās apakšdirektorijas: .* un .*$"
+
+" ms
+syn match diffIdentical	"^Fail .* dan .* adalah serupa$"
+syn match diffDiffer	"^Fail .* dan .* berbeza$"
+syn match diffBDiffer	"^Fail .* dan .* berbeza$"
+syn match diffIsA	"^Fail .* adalah .* manakala fail .* adalah .*$"
+syn match diffNoEOL	"^Tiada baris baru pada penghujung fail"
+syn match diffCommon	"^Subdirektori umum: .* dan .*$"
+
+" nl
+syn match diffOnly	"^Alleen in .*: .*$"
+syn match diffIdentical	"^Bestanden .* en .* zijn identiek$"
+syn match diffDiffer	"^Bestanden .* en .* zijn verschillend$"
+syn match diffBDiffer	"^Bestanden .* en .* zijn verschillend$"
+syn match diffIsA	"^Bestand .* is een .* terwijl bestand .* een .* is$"
+syn match diffNoEOL	"^Geen regeleindeteken (LF) aan einde van bestand"
+syn match diffCommon	"^Gemeenschappelijke submappen: .* en .*$"
+
+" pl
+syn match diffOnly	"^Tylko w .*: .*$"
+syn match diffIdentical	"^Pliki .* i .* są identyczne$"
+syn match diffDiffer	"^Pliki .* i .* różnią się$"
+syn match diffBDiffer	"^Pliki .* i .* różnią się$"
+syn match diffIsA	"^Plik .* jest .*, podczas gdy plik .* jest .*$"
+syn match diffNoEOL	"^Brak znaku nowej linii na końcu pliku"
+syn match diffCommon	"^Wspólne podkatalogi: .* i .*$"
+
+" pt_BR
+syn match diffOnly	"^Somente em .*: .*$"
+syn match diffOnly	"^Apenas em .*: .*$"
+syn match diffIdentical	"^Os aquivos .* e .* são idênticos$"
+syn match diffDiffer	"^Os arquivos .* e .* são diferentes$"
+syn match diffBDiffer	"^Os arquivos binários .* e .* são diferentes$"
+syn match diffIsA	"^O arquivo .* é .* enquanto o arquivo .* é .*$"
+syn match diffNoEOL	"^Falta o caracter nova linha no final do arquivo"
+syn match diffCommon	"^Subdiretórios idênticos: .* e .*$"
+
+" ro
+syn match diffOnly	"^Doar în .*: .*$"
+syn match diffIdentical	"^Fişierele .* şi .* sunt identice$"
+syn match diffDiffer	"^Fişierele .* şi .* diferă$"
+syn match diffBDiffer	"^Fişierele binare .* şi .* diferă$"
+syn match diffIsA	"^Fişierul .* este un .* pe când fişierul .* este un .*.$"
+syn match diffNoEOL	"^Nici un element de linie nouă la sfârşitul fişierului"
+syn match diffCommon	"^Subdirectoare comune: .* şi .*.$"
+
+" ru
+syn match diffOnly	"^Только в .*: .*$"
+syn match diffIdentical	"^Файлы .* и .* идентичны$"
+syn match diffDiffer	"^Файлы .* и .* различаются$"
+syn match diffBDiffer	"^Файлы .* и .* различаются$"
+syn match diffIsA	"^Файл .* это .*, тогда как файл .* -- .*$"
+syn match diffNoEOL	"^В конце файла нет новой строки"
+syn match diffCommon	"^Общие подкаталоги: .* и .*$"
+
+" sr
+syn match diffOnly	"^Само у .*: .*$"
+syn match diffIdentical	"^Датотеке „.*“ и „.*“ се подударају$"
+syn match diffDiffer	"^Датотеке .* и .* различите$"
+syn match diffBDiffer	"^Бинарне датотеке .* и .* различите$"
+syn match diffIsA	"^Датотека „.*“ је „.*“ док је датотека „.*“ „.*“$"
+syn match diffNoEOL	"^Без новог реда на крају датотеке"
+syn match diffCommon	"^Заједнички поддиректоријуми: .* и .*$"
+
+" sv
+syn match diffOnly	"^Endast i .*: .*$"
+syn match diffIdentical	"^Filerna .* och .* är lika$"
+syn match diffDiffer	"^Filerna .* och .* skiljer$"
+syn match diffBDiffer	"^Filerna .* och .* skiljer$"
+syn match diffIsA	"^Fil .* är en .* medan fil .* är en .*$"
+syn match diffNoEOL	"^Ingen nyrad vid filslut"
+syn match diffCommon	"^Lika underkataloger: .* och .*$"
+
+" tr
+syn match diffOnly	"^Yalnızca .*'da: .*$"
+syn match diffIdentical	"^.* ve .* dosyaları birbirinin aynı$"
+syn match diffDiffer	"^.* ve .* dosyaları birbirinden farklı$"
+syn match diffBDiffer	"^.* ve .* dosyaları birbirinden farklı$"
+syn match diffIsA	"^.* dosyası, bir .*, halbuki .* dosyası bir .*$"
+syn match diffNoEOL	"^Dosya sonunda yenisatır yok."
+syn match diffCommon	"^Ortak alt dizinler: .* ve .*$"
+
+" uk
+syn match diffOnly	"^Лише у .*: .*$"
+syn match diffIdentical	"^Файли .* та .* ідентичні$"
+syn match diffDiffer	"^Файли .* та .* відрізняються$"
+syn match diffBDiffer	"^Файли .* та .* відрізняються$"
+syn match diffIsA	"^Файл .* це .*, тоді як файл .* -- .*$"
+syn match diffNoEOL	"^Наприкінці файлу немає нового рядка"
+syn match diffCommon	"^Спільні підкаталоги: .* та .*$"
+
+" vi
+syn match diffOnly	"^Chỉ trong .*: .*$"
+syn match diffIdentical	"^Hai tập tin .* và .* là bằng nhau.$"
+syn match diffDiffer	"^Hai tập tin .* và .* là khác nhau.$"
+syn match diffBDiffer	"^Hai tập tin .* và .* là khác nhau.$"
+syn match diffIsA	"^Tập tin .* là một .* còn tập tin .* là một .*.$"
+syn match diffNoEOL	"^Không có ký tự dòng mới tại kêt thức tập tin."
+syn match diffCommon	"^Thư mục con chung: .* và .*$"
+
+" zh_CN
+syn match diffOnly	"^只在 .* 存在：.*$"
+syn match diffIdentical	"^檔案 .* 和 .* 相同$"
+syn match diffDiffer	"^文件 .* 和 .* 不同$"
+syn match diffBDiffer	"^文件 .* 和 .* 不同$"
+syn match diffIsA	"^文件 .* 是.*而文件 .* 是.*$"
+syn match diffNoEOL	"^文件尾没有 newline 字符"
+syn match diffCommon	"^.* 和 .* 有共同的子目录$"
+
+" zh_TW
+syn match diffDiffer	"^檔案 .* 與 .* 不同$"
+syn match diffBDiffer	"^二元碼檔 .* 與 .* 不同$"
+syn match diffIsA	"^檔案 .* 是.*而檔案 .* 是.*$"
+syn match diffNoEOL	"^檔案末沒有 newline 字元"
+syn match diffCommon	"^.* 和 .* 有共同的副目錄$"
+
 
 syn match diffRemoved	"^-.*"
 syn match diffRemoved	"^<.*"

Raspunde prin e-mail lui