Skip to content

pull_regex should consider Git translations. #511

Merged
merged 1 commit into from Nov 15, 2012

2 participants

@alenzen
alenzen commented Oct 19, 2012

Git has been translated to Danish, German, Icelandic, Italian, Dutch, Portuguese, Swedish, Vietnamese, and Chinese.

The regular expression pull_regex does not reflect this and thus leads to an error (Didn't find indication of success in output, assuming git pull failed).

This change takes in to consideration that the output could be any of the following seven languages (more translations do not affect the specific output of diff.c at the time of writing): English, German, Italian, Portuguese, Swedish (translated but not activated in Git), Vietnamese (translated but not activated in Git), and Chinese:

1 file changed, 1 insertion(+), 1 deletion(-)
2 files changed, 2 insertions(+), 2 deletions(-)

1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
2 Datein geändert, 2 Zeile hinzugefügt(+), 2 Zeilen entfernt(-)

1 file modificato, 1 inserzione(+), 1 rimozione(-)
2 file modificati, 2 inserzioni(+), 2 inserzioni(-)

1 ficheiro modificado, 1 adição(+), 1 eliminado(-)
2 ficheiros modificados, 2 adições(+), 2 eliminados(-)

1 fil ändrad, 1 tillägg(+), 1 borttagning(-)
2 filer ändrade, 2 tillägg(+), 2 borttagningar(-)

1 tập tin thay đổi, 1 thêm(+), 1 xóa(-)
2 tập tin thay đổi, 2 thêm(+), 2 xóa(-)

1 个文件被修改, 插入 1 行(+), 删除 1 行(-)
2 个文件被修改, 插入 2 行(+), 删除 2 行(-)

For reference:
https://github.com/git/git/blob/master/diff.c
https://github.com/git/git/tree/master/po

@midgetspy midgetspy merged commit acadc39 into midgetspy:master Nov 15, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.