Skip to content

Commit

Permalink
Merge pull request #289 from drzix/dynamic_translation
Browse files Browse the repository at this point in the history 
Translate the string which is displayed after event was triggered on status bar
  • Loading branch information
@andersevenrud
andersevenrud committed Jan 21, 2016
2 parents 286f850 + 1016251 commit 925516f
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 46 deletions.
81 changes: 42 additions & 39 deletions src/packages/default/Draw/locales.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
'Move active layer' : 'Премести активен слой',

'Picker' : 'берач',
'LMB: set fg color, RMB: set bg color' : 'LMB: изберете цвят за преден план, RMB: изберете цвят за фон',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: изберете цвят за преден план, RMB: изберете цвят за фон',

'Pencil' : 'Молив',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: рисувай с fg/bg цвят',
Expand Down Expand Up @@ -108,7 +108,7 @@
'Move active layer' : 'Bewege aktive Ebene',

'Picker' : 'Wähler',
'LMB: set fg color, RMB: set bg color' : 'LMB: wähle Vordergrundfarbe, RMB: wähle Hintergrundfarbe',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: wähle Vordergrundfarbe, RMB: wähle Hintergrundfarbe',

'Pencil' : 'Stift',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: Zeichnen mit fg/bg Farbe',
Expand Down Expand Up @@ -155,7 +155,7 @@
'Move active layer' : 'Mover la capa activa',

'Picker' : 'Selector',
'LMB: set fg color, RMB: set bg color' : 'LMB: Establecer el color de primer plano, RMB: Establecer el color de fondo',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: Establecer el color de primer plano, RMB: Establecer el color de fondo',

'Pencil' : 'Lápiz',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: Dibujar con el color de fondo/de primer plano',
Expand Down Expand Up @@ -202,7 +202,7 @@
'Move active layer' : 'Déplacer le calque actif',

'Picker' : 'Plukker',
'LMB: set fg color, RMB: set bg color' : 'LMB: Définir la couleur du première plan, RMB: Définir la couleur de l\'arrière plan',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: Définir la couleur du première plan, RMB: Définir la couleur de l\'arrière plan',
//Set BG color plutot non?

'Pencil' : 'Pinceau',
Expand All @@ -213,7 +213,7 @@
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Dessiner avec la couleur d\'avant/arrière plan, SHIFT: Dessiner rectangle',

'Circle/Ellipse' : 'Cercle/Ellipse',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Dessiner avec la couleur d\'avant/arrière plan, SHIFT: Dessiner ellipse',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: Dessiner avec la couleur d\'avant/arrière plan, SHIFT: Dessiner ellipse',

'Blur' : 'Flou (Blur)',
'Noise' : 'Bruit',
Expand Down Expand Up @@ -250,7 +250,7 @@
'Move active layer' : 'Sposta livello attivo',

'Picker' : 'Selettore',
'LMB: set fg color, RMB: set bg color' : 'LMB: Imposta colore primopiano, RMB: Imposta colore di sfondo',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: Imposta colore primopiano, RMB: Imposta colore di sfondo',

'Pencil' : 'Matita',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: Disegna con colori fg/bg',
Expand Down Expand Up @@ -297,17 +297,17 @@
'Move active layer' : '활성 레이어 옮기기',

'Picker' : '색상 추출',
'LMB: set fg color, RMB: set bg color' : '왼쪽 마우스 버튼: 전경색, 오른쪽 마우스 버튼 ',
'LMB: Pick foreground-, RMB: Pick background color' : '왼쪽 마우스 버튼: 전경색, 오른쪽 마우스 버튼 : 배경색',

'Pencil' : '연필',
'LMB/RMB: Draw with fg/bg color' : '왼쪽 마우스/오른쪽 마우스 버튼 전경/배경색 그리기',
'LMB: Use foreground-, RMB: Use background color' : '왼쪽 마우스/오른쪽 마우스 버튼 전경/배경색 그리기',
'Path' : '경로',

'Square/Rectangle' : '정사각형/직사각형',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : '왼쪽/오른쪽 마우스 버튼 전경/배경색 그리기, SHIFT: 직사각형 그리기',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : '왼쪽/오른쪽 마우스 버튼 전경/배경색 그리기, SHIFT: 직사각형 그리기',

'Circle/Ellipse' : '원/타원',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : '왼쪽/오른쪽 마우스 버튼 전경/배경색 그리기, SHIFT: 타원 그리기',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : '왼쪽/오른쪽 마우스 버튼 전경/배경색 그리기, SHIFT: 타원 그리기',

'Blur' : '블러',
'Noise' : '노이즈',
Expand All @@ -317,7 +317,10 @@
'Simple Blur' : '약한 블러',

'Radius' : '반경',
'Iterations' : '반복'
'Iterations' : '반복',

'LMB: Fill with foreground-, RMB: Fill with background color': '왼쪽 마우스/오른쪽 마우스 버튼 전경/배경색 칠하기',
'Set {0} color': '{0}색을 선택'
},
nl_NL : {
'Toggle tools toolbar' : 'Toolbar gereedschappen',
Expand All @@ -344,17 +347,17 @@
'Move active layer' : 'Verplaats de aktieve laag',

'Picker' : 'Kiezer',
'LMB: set fg color, RMB: set bg color' : 'LMB: Kies voorgrond-kleur, RMB: Kies achtergrondkleur',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: Kies voorgrond-kleur, RMB: Kies achtergrondkleur',

'Pencil' : 'Penseel',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: Teken met voor- en achtergrondkleur',
'LMB: Use foreground-, RMB: Use background color' : 'LMB/RMB: Teken met voor- en achtergrondkleur',
'Path' : 'Pfad',

'Square/Rectangle' : 'Vierkant/rechthoek',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Teken met voor- en achtergrondkleur, SHIFT: Rechnthoek tekenen',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : 'LMB/RMB: Teken met voor- en achtergrondkleur, SHIFT: Rechnthoek tekenen',

'Circle/Ellipse' : 'Cirkel/elipse',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: Teken met voor- en achtergrondkleur, SHIFT: Elipse tekenen',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : 'LMB/RMB: Teken met voor- en achtergrondkleur, SHIFT: Elipse tekenen',

'Blur' : 'Vager maken (Blur)',
'Noise' : 'Ruis',
Expand Down Expand Up @@ -391,17 +394,17 @@
'Move active layer' : 'Flytt aktivt lag',

'Picker' : 'Plukker',
'LMB: set fg color, RMB: set bg color' : 'LMB: sett bg farge, RMB: sett fg farge',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: sett bg farge, RMB: sett fg farge',

'Pencil' : 'Penn',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: Tegn med fg/bg farge',
'LMB: Use foreground-, RMB: Use background color' : 'LMB/RMB: Tegn med fg/bg farge',
'Path' : 'Sti',

'Square/Rectangle' : 'Firkant/Rektangel',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Tegn med fg/bg farge, SHIFT: Tegn rektangel',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : 'LMB/RMB: Tegn med fg/bg farge, SHIFT: Tegn rektangel',

'Circle/Ellipse' : 'Sirkel/Ellipse',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: Tegn med fg/bg farge, SHIFT: Tegn ellipse',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : 'LMB/RMB: Tegn med fg/bg farge, SHIFT: Tegn ellipse',

'Blur' : 'Klatte (Blur)',
'Noise' : 'Støy',
Expand Down Expand Up @@ -436,17 +439,17 @@
'Move active layer' : 'Przenieś aktywne warstwy',

'Picker' : 'Wybór',
'LMB: set fg color, RMB: set bg color' : 'LMB: Wstaw kolor bg, RMB: ustaw kolor fg',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: Wstaw kolor bg, RMB: ustaw kolor fg',

'Pencil' : 'Ołówek',
'LMB/RMB: Draw with fg/bg color' : 'Maluj w kolorze fg/bg',
'LMB: Use foreground-, RMB: Use background color' : 'Maluj w kolorze fg/bg',
'Path' : 'Ścieżka',

'Square/Rectangle' : 'Kwadratowe / prostokątne',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Maluj w kolorze fb/bg, SHIFT: Narysuj prostokąt',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : 'LMB/RMB: Maluj w kolorze fb/bg, SHIFT: Narysuj prostokąt',

'Circle/Ellipse' : 'Koło / Elipsa',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: Maluj w kolorze fb/bg, SHIFT: Narysuj elipse',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : 'LMB/RMB: Maluj w kolorze fb/bg, SHIFT: Narysuj elipse',

'Blur' : 'Blur',
'Noise' : 'Szum',
Expand Down Expand Up @@ -483,17 +486,17 @@
'Move active layer' : 'Перемещает активный слой',

'Picker' : 'Пипетка',
'LMB: set fg color, RMB: set bg color' : 'ЛКМ: устананавливает первичный цвет, ПКМ: устанавливает вторичный(фоновый) цвет',
'LMB: Pick foreground-, RMB: Pick background color' : 'ЛКМ: устананавливает первичный цвет, ПКМ: устанавливает вторичный(фоновый) цвет',

'Pencil' : 'Карандаш',
'LMB/RMB: Draw with fg/bg color' : 'ЛКМ/ПКМ: Рисует первичным/вторичным цветом',
'LMB: Use foreground-, RMB: Use background color' : 'ЛКМ/ПКМ: Рисует первичным/вторичным цветом',
'Path' : 'Прямая',

'Square/Rectangle' : 'Квадрат/Прямоугольник',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'ЛКМ/ПКМ: рисует первичным/вторичным цветом квадрат, SHIFT: нарисовать прямоуголник',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : 'ЛКМ/ПКМ: рисует первичным/вторичным цветом квадрат, SHIFT: нарисовать прямоуголник',

'Circle/Ellipse' : 'Круг/Эллипс',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'ЛКМ/ПКМ: рисует первичным/вторичным цветом круг, SHIFT: нарисовать эллипс',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : 'ЛКМ/ПКМ: рисует первичным/вторичным цветом круг, SHIFT: нарисовать эллипс',

'Blur' : 'Размытие (Blur)',
'Noise' : 'Шум',
Expand Down Expand Up @@ -528,17 +531,17 @@
'Move active layer' : 'Presuň aktívnu vrstvu',

'Picker' : 'Kurzor',
'LMB: set fg color, RMB: set bg color' : 'LMB: nastav farbu pozadia, RMB: nastav farbu popredia',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: nastav farbu pozadia, RMB: nastav farbu popredia',

'Pencil' : 'Ceruzka',
'LMB/RMB: Draw with fg/bg color' : 'Maľuj farbou fg/bg',
'LMB: Use foreground-, RMB: Use background color' : 'Maľuj farbou fg/bg',
'Path' : 'Cesta',

'Square/Rectangle' : 'Štvorec / Obdĺžnik',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Maľuj farbou fb/bg, SHIFT: Obdĺžnik',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : 'LMB/RMB: Maľuj farbou fb/bg, SHIFT: Obdĺžnik',

'Circle/Ellipse' : 'Kruh / Elipsa',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: Maľuj farbou fb/bg, SHIFT: Elipsa',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : 'LMB/RMB: Maľuj farbou fb/bg, SHIFT: Elipsa',

'Blur' : 'Rozmazať',
'Noise' : 'Šum',
Expand Down Expand Up @@ -575,17 +578,17 @@
'Move active layer' : 'hareket eden katman',

'Picker' : 'toplayıcı',
'LMB: set fg color, RMB: set bg color' : 'LMB: fg rengi ayarla, RMB: gb rengi ayarla',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: fg rengi ayarla, RMB: gb rengi ayarla',

'Pencil' : 'kalem',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB:fg/bg rengi ile çiz',
'LMB: Use foreground-, RMB: Use background color' : 'LMB/RMB:fg/bg rengi ile çiz',
'Path' : 'yol',

'Square/Rectangle' : 'kare/üçgen',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: fg/bg renkleri ile çiz , SHIFT: üçgen çiz',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : 'LMB/RMB: fg/bg renkleri ile çiz , SHIFT: üçgen çiz',

'Circle/Ellipse' : 'dair/elips',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: fb/bg ile çiz , SHIFT: elips çiz',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : 'LMB/RMB: fb/bg ile çiz , SHIFT: elips çiz',

'Blur' : 'Bulanık',
'Noise' : 'gürültü',
Expand Down Expand Up @@ -622,17 +625,17 @@
'Move active layer' : 'Di chuyển layer đang chọn',

'Picker' : 'Bảng chọn',
'LMB: set fg color, RMB: set bg color' : 'LMB: chọn màu fg, RMB: chọn màu gb',
'LMB: Pick foreground-, RMB: Pick background color' : 'LMB: chọn màu fg, RMB: chọn màu gb',

'Pencil' : 'Bút chì',
'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: vẽ với màu fg/bg',
'LMB: Use foreground-, RMB: Use background color' : 'LMB/RMB: vẽ với màu fg/bg',
'Path' : 'Đường',

'Square/Rectangle' : 'Firkant/Rektangel',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Tegn med fg/bg farge, SHIFT: Tegn rektangel',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle rectangle/square mode' : 'LMB/RMB: Tegn med fg/bg farge, SHIFT: Tegn rektangel',

'Circle/Ellipse' : 'Vuông / chữ nhật',
'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: vẽ với màu fg/bg, SHIFT: Vẽ ê-líp',
'LMB: Use foreground-, RMB: Use background color. SHIFT: Toggle circle/ellipse mode' : 'LMB/RMB: vẽ với màu fg/bg, SHIFT: Vẽ ê-líp',

'Blur' : 'Làm mờ',
'Noise' : 'Làm nhiễu',
Expand Down
8 changes: 5 additions & 3 deletions src/packages/default/Draw/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@
// WINDOWS
/////////////////////////////////////////////////////////////////////////////

var doTranslate = OSjs.Applications.ApplicationDraw._;

function ApplicationDrawWindow(app, metadata, scheme, file) {
DefaultApplicationWindow.apply(this, ['ApplicationDrawWindow', {
icon: metadata.icon,
Expand Down Expand Up @@ -244,7 +246,7 @@

// Load and set up scheme (GUI) here
scheme.render(this, 'DrawWindow', root, null, null, {
_: OSjs.Applications.ApplicationDraw._
_: doTranslate
});

var statusbar = scheme.find(this, 'Statusbar');
Expand Down Expand Up @@ -354,7 +356,7 @@
ts.forEach(function(t) {
scheme.find(self, 'tool-' + t).on('click', function() {
var stats = tools[t].statusText || '';
statusbar.set('value', stats);
statusbar.set('value', doTranslate(stats));

self.setToolProperty('name', t);
});
Expand Down Expand Up @@ -391,7 +393,7 @@
var self = this;

API.createDialog('Color', {
title: 'Set ' + param + ' color', // FIXME: Locale
title: doTranslate('Set {0} color', param),
color: self.tool[param]
}, function(ev, button, result) {
if ( button !== 'ok' ) { return; }
Expand Down
4 changes: 3 additions & 1 deletion src/packages/default/FileManager/locales.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@
"Loading..." : "기다려주세요...",
"Create a new directory in <span>{0}</span>" : "<span>{0}</span>에 새 폴더 만들기",
"Rename <span>{0}</span>" : "<span>{0}</span>의 이름 바꾸기",
"Delete <span>{0}</span> ?" : "<span>{0}</span>을 삭제하시겠습니까?"
"Delete <span>{0}</span> ?" : "<span>{0}</span>을 삭제하시겠습니까?",
'Selected {0} files, {1} dirs, {2}' : '{0} 개의 파일, {1} 개의 디렉토리가 선택됨, {2}',
'Showing {0} files ({1} hidden), {2} dirs, {3}' : '{0} 개의 파일({1} 개의 숨긴 파일), {2} 개의 디렉토리가 존재, {3}'
},
nl_NL : {
'Show sidebar' : 'Zijbar tonen',
Expand Down
6 changes: 3 additions & 3 deletions src/packages/default/FileManager/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@
};

ApplicationFileManagerWindow.prototype.checkSelection = function(files) {
// FIXME: Locales
var scheme = this._scheme;

if ( !scheme ) {
Expand All @@ -218,6 +217,7 @@
var self = this;
var content = '';
var statusbar = scheme.find(this, 'Statusbar');
var doTranslate = OSjs.Applications.ApplicationFileManager._;

var sum, label;

Expand All @@ -239,14 +239,14 @@
});

label = 'Selected {0} files, {1} dirs, {2}';
content = Utils.format(label, sum.files, sum.directories, Utils.humanFileSize(sum.size));
content = doTranslate(label, sum.files, sum.directories, Utils.humanFileSize(sum.size));

toggleMenuItems(sum.files && !sum.directories);
} else {
sum = this.currentSummary;
if ( sum ) {
label = 'Showing {0} files ({1} hidden), {2} dirs, {3}';
content = Utils.format(label, sum.files, sum.hidden, sum.directories, Utils.humanFileSize(sum.size));
content = doTranslate(label, sum.files, sum.hidden, sum.directories, Utils.humanFileSize(sum.size));
}

toggleMenuItems(false);
Expand Down

0 comments on commit 925516f

Please sign in to comment.