From 57ee73c1153995236203470c21bc9d584af44f0a Mon Sep 17 00:00:00 2001 From: Jannis Rondorf Date: Fri, 28 Jul 2017 15:12:06 +0200 Subject: [PATCH] Additional translations --- build/libifm.php | 106 ++++++++++++++++++++-------- ifm.php | 106 ++++++++++++++++++++-------- src/i18n/de.json | 25 ++++++- src/i18n/en.json | 25 ++++++- src/main.php | 4 +- src/templates/app.html | 30 ++++---- src/templates/footer.html | 2 +- src/templates/login.html | 12 ++-- src/templates/modal.uploadfile.html | 8 +-- 9 files changed, 228 insertions(+), 90 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index d3f5e0b..70b9976 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -23,7 +23,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), - "locale" => "en", + "language" => "en", // api controls "ajaxrequest" => 1, @@ -107,7 +107,7 @@ class IFM {
-
Drop files to upload
+
{{i18n.upload_drop}}
- + {{#config.download}} {{/config.download}} {{#config.showlastmodified}} - + {{/config.showlastmodified}} {{#config.showfilesize}} - + {{/config.showfilesize}} {{#config.showpermissions}} - + {{/config.showpermissions}} {{#config.showowner}} - + {{/config.showowner}} {{#config.showgroup}} - + {{/config.showgroup}} @@ -184,7 +184,7 @@ class IFM {
Filename{{i18n.filename}}last modified{{i18n.last_modified}}size{{i18n.size}}
-
IFM - improved file manager | ifm.php hidden | Visit the project on GitHub
+
{{i18n.footer}} {{i18n.github}}
f00bar; @@ -234,13 +234,13 @@ body {
- + {{error}} - - - - - + + + + +
@@ -305,7 +305,7 @@ f00bar;
@@ -512,15 +512,15 @@ f00bar;
@@ -532,7 +532,30 @@ f00bar; { "refresh": "Refresh", "upload": "Upload", - "file_edit_success": "File successfully edited / created." + "file_edit_success": "File successfully edited / created.", + "toggle_nav": "Toggle navigation", + "path_content": "Content of", + "file_new": "New File", + "folder_new": "New Folder", + "upload_remote": "Remote Upload", + "ajax_request": "AJAX Request", + "logout": "Log Off", + "upload_drop": "Drop files to upload", + "filename": "Filename", + "size": "Size", + "last_modified": "Last Modified", + "permissions": "Permissions", + "owner": "Owner", + "group": "Group", + "footer": "IFM - improved file manager | ifm.php hidden |", + "github": "Visit the project on GitHub", + "tasks": "Tasks", + "login": "Login", + "username": "username", + "password": "Password", + "upload_file": "Upload File", + "filename_new": "New Filename", + "cancel": "Cancel" } f00bar; $i18n['en'] = json_decode($i18n['en'], true); @@ -540,7 +563,30 @@ f00bar; { "refresh": "Auffrischen", "upload": "Hochladen", - "file_edit_success": "Datei erfolgreich geändert / angelegt." + "file_edit_success": "Datei erfolgreich geändert / angelegt.", + "toggle_nav": "Navigation umschalten", + "path_content": "Inhalt von", + "file_new": "Neue Datei", + "folder_new": "Neue Ordner", + "upload_remote": "Hochladen von draussen", + "ajax_request": "AJAX Request", + "logout": "Abmelden", + "upload_drop": "Dateien zum hochladen hier hinziehen", + "filename": "Dateiname", + "size": "Größe", + "last_modified": "Zuletzt geändert", + "permissions": "Berechtigungen", + "owner": "Besitzer", + "group": "Gruppe", + "footer": "IFM - verbesserter file manager | ifm.php versteckt |", + "github": "Besuche das Projekt auf GitHub", + "tasks": "Aufgaben", + "login": "Anmeldung", + "username": "Benutzername", + "password": "Passwort", + "upload_file": "Datei hochladen", + "filename_new": "Neuer Dateiname", + "cancel": "Abbrechen" } f00bar; $i18n['de'] = json_decode($i18n['de'], true); @@ -2344,7 +2390,7 @@ function IFM( params ) { } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); } elseif( $_REQUEST["api"] == "getI18N" ) { - echo json_encode( $this->i18n[$this->config[locale]] ); + echo json_encode( $this->i18n[$this->config['language']] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/ifm.php b/ifm.php index 02e884a..abaf3f8 100644 --- a/ifm.php +++ b/ifm.php @@ -23,7 +23,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), - "locale" => "en", + "language" => "en", // api controls "ajaxrequest" => 1, @@ -107,7 +107,7 @@ class IFM {
-
Drop files to upload
+
{{i18n.upload_drop}}
- + {{#config.download}} {{/config.download}} {{#config.showlastmodified}} - + {{/config.showlastmodified}} {{#config.showfilesize}} - + {{/config.showfilesize}} {{#config.showpermissions}} - + {{/config.showpermissions}} {{#config.showowner}} - + {{/config.showowner}} {{#config.showgroup}} - + {{/config.showgroup}} @@ -184,7 +184,7 @@ class IFM {
Filename{{i18n.filename}}last modified{{i18n.last_modified}}size{{i18n.size}}
-
IFM - improved file manager | ifm.php hidden | Visit the project on GitHub
+
{{i18n.footer}} {{i18n.github}}
f00bar; @@ -234,13 +234,13 @@ body {
- + {{error}} - - - - - + + + + +
@@ -305,7 +305,7 @@ f00bar;
@@ -512,15 +512,15 @@ f00bar;
@@ -532,7 +532,30 @@ f00bar; { "refresh": "Refresh", "upload": "Upload", - "file_edit_success": "File successfully edited / created." + "file_edit_success": "File successfully edited / created.", + "toggle_nav": "Toggle navigation", + "path_content": "Content of", + "file_new": "New File", + "folder_new": "New Folder", + "upload_remote": "Remote Upload", + "ajax_request": "AJAX Request", + "logout": "Log Off", + "upload_drop": "Drop files to upload", + "filename": "Filename", + "size": "Size", + "last_modified": "Last Modified", + "permissions": "Permissions", + "owner": "Owner", + "group": "Group", + "footer": "IFM - improved file manager | ifm.php hidden |", + "github": "Visit the project on GitHub", + "tasks": "Tasks", + "login": "Login", + "username": "username", + "password": "Password", + "upload_file": "Upload File", + "filename_new": "New Filename", + "cancel": "Cancel" } f00bar; $i18n['en'] = json_decode($i18n['en'], true); @@ -540,7 +563,30 @@ f00bar; { "refresh": "Auffrischen", "upload": "Hochladen", - "file_edit_success": "Datei erfolgreich geändert / angelegt." + "file_edit_success": "Datei erfolgreich geändert / angelegt.", + "toggle_nav": "Navigation umschalten", + "path_content": "Inhalt von", + "file_new": "Neue Datei", + "folder_new": "Neue Ordner", + "upload_remote": "Hochladen von draussen", + "ajax_request": "AJAX Request", + "logout": "Abmelden", + "upload_drop": "Dateien zum hochladen hier hinziehen", + "filename": "Dateiname", + "size": "Größe", + "last_modified": "Zuletzt geändert", + "permissions": "Berechtigungen", + "owner": "Besitzer", + "group": "Gruppe", + "footer": "IFM - verbesserter file manager | ifm.php versteckt |", + "github": "Besuche das Projekt auf GitHub", + "tasks": "Aufgaben", + "login": "Anmeldung", + "username": "Benutzername", + "password": "Passwort", + "upload_file": "Datei hochladen", + "filename_new": "Neuer Dateiname", + "cancel": "Abbrechen" } f00bar; $i18n['de'] = json_decode($i18n['de'], true); @@ -2344,7 +2390,7 @@ function IFM( params ) { } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); } elseif( $_REQUEST["api"] == "getI18N" ) { - echo json_encode( $this->i18n[$this->config[locale]] ); + echo json_encode( $this->i18n[$this->config['language']] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/src/i18n/de.json b/src/i18n/de.json index f744028..35ccb1c 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -1,5 +1,28 @@ { "refresh": "Auffrischen", "upload": "Hochladen", - "file_edit_success": "Datei erfolgreich geändert / angelegt." + "file_edit_success": "Datei erfolgreich geändert / angelegt.", + "toggle_nav": "Navigation umschalten", + "path_content": "Inhalt von", + "file_new": "Neue Datei", + "folder_new": "Neue Ordner", + "upload_remote": "Hochladen von draussen", + "ajax_request": "AJAX Request", + "logout": "Abmelden", + "upload_drop": "Dateien zum hochladen hier hinziehen", + "filename": "Dateiname", + "size": "Größe", + "last_modified": "Zuletzt geändert", + "permissions": "Berechtigungen", + "owner": "Besitzer", + "group": "Gruppe", + "footer": "IFM - verbesserter file manager | ifm.php versteckt |", + "github": "Besuche das Projekt auf GitHub", + "tasks": "Aufgaben", + "login": "Anmeldung", + "username": "Benutzername", + "password": "Passwort", + "upload_file": "Datei hochladen", + "filename_new": "Neuer Dateiname", + "cancel": "Abbrechen" } \ No newline at end of file diff --git a/src/i18n/en.json b/src/i18n/en.json index 2655689..95e62c9 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1,5 +1,28 @@ { "refresh": "Refresh", "upload": "Upload", - "file_edit_success": "File successfully edited / created." + "file_edit_success": "File successfully edited / created.", + "toggle_nav": "Toggle navigation", + "path_content": "Content of", + "file_new": "New File", + "folder_new": "New Folder", + "upload_remote": "Remote Upload", + "ajax_request": "AJAX Request", + "logout": "Log Off", + "upload_drop": "Drop files to upload", + "filename": "Filename", + "size": "Size", + "last_modified": "Last Modified", + "permissions": "Permissions", + "owner": "Owner", + "group": "Group", + "footer": "IFM - improved file manager | ifm.php hidden |", + "github": "Visit the project on GitHub", + "tasks": "Tasks", + "login": "Login", + "username": "username", + "password": "Password", + "upload_file": "Upload File", + "filename_new": "New Filename", + "cancel": "Cancel" } \ No newline at end of file diff --git a/src/main.php b/src/main.php index ebaee5f..a1c01b3 100644 --- a/src/main.php +++ b/src/main.php @@ -24,7 +24,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), - "locale" => "en", + "language" => "en", // api controls "ajaxrequest" => 1, @@ -244,7 +244,7 @@ f00bar; } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); } elseif( $_REQUEST["api"] == "getI18N" ) { - echo json_encode( $this->i18n[$this->config[locale]] ); + echo json_encode( $this->i18n[$this->config['language']] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/src/templates/app.html b/src/templates/app.html index 230a83b..d9fd8b7 100644 --- a/src/templates/app.html +++ b/src/templates/app.html @@ -7,7 +7,7 @@
-
Drop files to upload
+
{{i18n.upload_drop}}
- + {{#config.download}} {{/config.download}} {{#config.showlastmodified}} - + {{/config.showlastmodified}} {{#config.showfilesize}} - + {{/config.showfilesize}} {{#config.showpermissions}} - + {{/config.showpermissions}} {{#config.showowner}} - + {{/config.showowner}} {{#config.showgroup}} - + {{/config.showgroup}} @@ -84,5 +84,5 @@
Filename{{i18n.filename}}last modified{{i18n.last_modified}}size{{i18n.size}}
-
IFM - improved file manager | ifm.php hidden | Visit the project on GitHub
+
{{i18n.footer}} {{i18n.github}}
diff --git a/src/templates/footer.html b/src/templates/footer.html index 2100bd3..7065c30 100644 --- a/src/templates/footer.html +++ b/src/templates/footer.html @@ -2,7 +2,7 @@
diff --git a/src/templates/login.html b/src/templates/login.html index b1ca338..4b97bc2 100644 --- a/src/templates/login.html +++ b/src/templates/login.html @@ -43,12 +43,12 @@ body {
- + {{error}} - - - - - + + + + +
diff --git a/src/templates/modal.uploadfile.html b/src/templates/modal.uploadfile.html index 8e25510..b209892 100644 --- a/src/templates/modal.uploadfile.html +++ b/src/templates/modal.uploadfile.html @@ -1,14 +1,14 @@