From 91a2664830ec9ca0d8f344cbd4914fdc98d6d707 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 26 Jan 2011 13:06:54 +0100 Subject: [PATCH] Internationalized (and localized to french) column names under Qt, which I had forgot to do. --- core_me/data.py | 39 ++++++++++++---------- core_pe/data.py | 19 ++++++----- core_se/data.py | 19 ++++++----- qt/lang/fr.ts | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 34 deletions(-) diff --git a/core_me/data.py b/core_me/data.py index 16df32a0..129aa53e 100644 --- a/core_me/data.py +++ b/core_me/data.py @@ -7,28 +7,31 @@ # http://www.hardcoded.net/licenses/bsd_license from hscommon.util import format_time, format_size +from hscommon.trans import tr as trbase from core.data import (format_path, format_timestamp, format_words, format_perc, format_dupe_count, cmp_value) +tr = lambda s: trbase(s, 'columns') + COLUMNS = [ - {'attr':'name','display':'Filename'}, - {'attr':'path','display':'Directory'}, - {'attr':'size','display':'Size (MB)'}, - {'attr':'duration','display':'Time'}, - {'attr':'bitrate','display':'Bitrate'}, - {'attr':'samplerate','display':'Sample Rate'}, - {'attr':'extension','display':'Kind'}, - {'attr':'mtime','display':'Modification'}, - {'attr':'title','display':'Title'}, - {'attr':'artist','display':'Artist'}, - {'attr':'album','display':'Album'}, - {'attr':'genre','display':'Genre'}, - {'attr':'year','display':'Year'}, - {'attr':'track','display':'Track Number'}, - {'attr':'comment','display':'Comment'}, - {'attr':'percentage','display':'Match %'}, - {'attr':'words','display':'Words Used'}, - {'attr':'dupe_count','display':'Dupe Count'}, + {'attr': 'name', 'display': tr("Filename")}, + {'attr': 'path', 'display': tr("Folder")}, + {'attr': 'size', 'display': tr("Size (MB)")}, + {'attr': 'duration', 'display': tr("Time")}, + {'attr': 'bitrate', 'display': tr("Bitrate")}, + {'attr': 'samplerate', 'display': tr("Sample Rate")}, + {'attr': 'extension', 'display': tr("Kind")}, + {'attr': 'mtime', 'display': tr("Modification")}, + {'attr': 'title', 'display': tr("Title")}, + {'attr': 'artist', 'display': tr("Artist")}, + {'attr': 'album', 'display': tr("Album")}, + {'attr': 'genre', 'display': tr("Genre")}, + {'attr': 'year', 'display': tr("Year")}, + {'attr': 'track', 'display': tr("Track Number")}, + {'attr': 'comment', 'display': tr("Comment")}, + {'attr': 'percentage', 'display': tr("Match %")}, + {'attr': 'words', 'display': tr("Words Used")}, + {'attr': 'dupe_count', 'display': tr("Dupe Count")}, ] MATCHPERC_COL = 15 diff --git a/core_pe/data.py b/core_pe/data.py index 09f1215c..c5f2c21d 100644 --- a/core_pe/data.py +++ b/core_pe/data.py @@ -7,20 +7,23 @@ # http://www.hardcoded.net/licenses/bsd_license from hscommon.util import format_size +from hscommon.trans import tr as trbase from core.data import format_path, format_timestamp, format_perc, format_dupe_count, cmp_value +tr = lambda s: trbase(s, 'columns') + def format_dimensions(dimensions): return '%d x %d' % (dimensions[0], dimensions[1]) COLUMNS = [ - {'attr':'name','display':'Filename'}, - {'attr':'path','display':'Directory'}, - {'attr':'size','display':'Size (KB)'}, - {'attr':'extension','display':'Kind'}, - {'attr':'dimensions','display':'Dimensions'}, - {'attr':'mtime','display':'Modification'}, - {'attr':'percentage','display':'Match %'}, - {'attr':'dupe_count','display':'Dupe Count'}, + {'attr':'name', 'display': tr("Filename")}, + {'attr':'path', 'display': tr("Folder")}, + {'attr':'size', 'display': tr("Size (KB)")}, + {'attr':'extension', 'display': tr("Kind")}, + {'attr':'dimensions', 'display': tr("Dimensions")}, + {'attr':'mtime', 'display': tr("Modification")}, + {'attr':'percentage', 'display': tr("Match %")}, + {'attr':'dupe_count', 'display': tr("Dupe Count")}, ] MATCHPERC_COL = 6 diff --git a/core_se/data.py b/core_se/data.py index f1ffcb91..9d166cd6 100644 --- a/core_se/data.py +++ b/core_se/data.py @@ -7,18 +7,21 @@ # http://www.hardcoded.net/licenses/bsd_license from hscommon.util import format_size +from hscommon.trans import tr as trbase from core.data import (format_path, format_timestamp, format_words, format_perc, format_dupe_count, cmp_value) +tr = lambda s: trbase(s, 'columns') + COLUMNS = [ - {'attr':'name','display':'Filename'}, - {'attr':'path','display':'Directory'}, - {'attr':'size','display':'Size (KB)'}, - {'attr':'extension','display':'Kind'}, - {'attr':'mtime','display':'Modification'}, - {'attr':'percentage','display':'Match %'}, - {'attr':'words','display':'Words Used'}, - {'attr':'dupe_count','display':'Dupe Count'}, + {'attr':'name', 'display': tr("Filename")}, + {'attr':'path', 'display': tr("Folder")}, + {'attr':'size', 'display': tr("Size (KB)")}, + {'attr':'extension', 'display': tr("Kind")}, + {'attr':'mtime', 'display': tr("Modification")}, + {'attr':'percentage', 'display': tr("Match %")}, + {'attr':'words', 'display': tr("Words Used")}, + {'attr':'dupe_count', 'display': tr("Dupe Count")}, ] MATCHPERC_COL = 5 diff --git a/qt/lang/fr.ts b/qt/lang/fr.ts index f0d03b31..6534a1e1 100644 --- a/qt/lang/fr.ts +++ b/qt/lang/fr.ts @@ -542,6 +542,93 @@ + + +columns + + Filename + Nom de fichier + + + Folder + Dossier + + + Size (KB) + Taille (KB) + + + Size (MB) + Taille (MB) + + + Kind + Type + + + Modification + Modification + + + Match % + Match % + + + Words Used + Mots + + + Dupe Count + # Doublons + + + + Time + Temps + + + Bitrate + Bitrate + + + Sample Rate + Sample Rate + + + Title + Titre + + + Artist + Artiste + + + Album + Album + + + Genre + Genre + + + Year + Année + + + Track Number + Track + + + Comment + Commentaire + + + + Dimensions + Dimensions + + + message