From fc1192628836b8f59501ad4733d7fe2f7f8969ea Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 15 Oct 2015 13:50:49 -0700 Subject: [PATCH] GUAC-1193: Add filter placeholder to search input field. --- .../settings/templates/settingsConnectionHistory.html | 2 +- guacamole/src/main/webapp/translations/de.json | 10 +++++++++- guacamole/src/main/webapp/translations/en.json | 10 +++++++--- guacamole/src/main/webapp/translations/fr.json | 10 +++++++++- guacamole/src/main/webapp/translations/it.json | 10 +++++++++- guacamole/src/main/webapp/translations/nl.json | 10 +++++++++- guacamole/src/main/webapp/translations/ru.json | 10 +++++++++- 7 files changed, 53 insertions(+), 9 deletions(-) diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html b/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html index a27a2d06b..900ba9a74 100644 --- a/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html +++ b/guacamole/src/main/webapp/app/settings/templates/settingsConnectionHistory.html @@ -26,7 +26,7 @@
- +
diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json index 8ff9539dd..674ed646c 100644 --- a/guacamole/src/main/webapp/translations/de.json +++ b/guacamole/src/main/webapp/translations/de.json @@ -30,6 +30,8 @@ "FIELD_HEADER_PASSWORD" : "Passwort:", "FIELD_HEADER_PASSWORD_AGAIN" : "Wiederhole Passwort:", + "FIELD_PLACEHOLDER_FILTER" : "Filter", + "FORMAT_DATE_TIME_PRECISE" : "dd-MM-yyyy HH:mm:ss", "INFO_ACTIVE_USER_COUNT" : "In Benutzung durch {USERS} Benutzer.", @@ -456,6 +458,12 @@ }, + "SETTINGS_CONNECTION_HISTORY" : { + + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER" + + }, + "SETTINGS_PREFERENCES" : { "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", @@ -518,7 +526,7 @@ "DIALOG_HEADER_CONFIRM_DELETE" : "Beende Sitzung", "DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR", - "FIELD_PLACEHOLDER_FILTER" : "Filter", + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index b58c209de..0a16bd34c 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -32,6 +32,8 @@ "FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_PASSWORD_AGAIN" : "Re-enter Password:", + "FIELD_PLACEHOLDER_FILTER" : "Filter", + "FORMAT_DATE_TIME_PRECISE" : "yyyy-MM-dd HH:mm:ss", "INFO_ACTIVE_USER_COUNT" : "Currently in use by {USERS} {USERS, plural, one{user} other{users}}.", @@ -479,6 +481,8 @@ "ACTION_SEARCH" : "@:APP.ACTION_SEARCH", + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", + "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", "HELP_CONNECTION_HISTORY" : "All connection history records are listed here. If you wish to filter the connection records, you can enter a query.", @@ -486,8 +490,8 @@ "INFO_NO_HISTORY" : "No matching connection history", "TABLE_HEADER_SESSION_CONNECTION_NAME" : "Connection name", - "TABLE_HEADER_SESSION_ENDDATE" : "End Time", - "TABLE_HEADER_SESSION_STARTDATE" : "Start Time", + "TABLE_HEADER_SESSION_ENDDATE" : "End time", + "TABLE_HEADER_SESSION_STARTDATE" : "Start time", "TABLE_HEADER_SESSION_USERNAME" : "Username" }, @@ -570,7 +574,7 @@ "DIALOG_HEADER_CONFIRM_DELETE" : "Kill Sessions", "DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR", - "FIELD_PLACEHOLDER_FILTER" : "Filter", + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json index 09b3a49c6..f14336d65 100644 --- a/guacamole/src/main/webapp/translations/fr.json +++ b/guacamole/src/main/webapp/translations/fr.json @@ -30,6 +30,8 @@ "FIELD_HEADER_PASSWORD" : "Mot de passe:", "FIELD_HEADER_PASSWORD_AGAIN" : "Répéter mot de passe:", + "FIELD_PLACEHOLDER_FILTER" : "Filtre", + "FORMAT_DATE_TIME_PRECISE" : "dd-MM-yyyy HH:mm:ss", "INFO_ACTIVE_USER_COUNT" : "Actuellement utilisé par {USERS} {USERS, plural, one{utilisateur} other{utilisateurs}}.", @@ -456,6 +458,12 @@ }, + "SETTINGS_CONNECTION_HISTORY" : { + + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER" + + }, + "SETTINGS_PREFERENCES" : { "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", @@ -518,7 +526,7 @@ "DIALOG_HEADER_CONFIRM_DELETE" : "Fermer Sessions", "DIALOG_HEADER_ERROR" : "Erreur", - "FIELD_PLACEHOLDER_FILTER" : "Filtre", + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", diff --git a/guacamole/src/main/webapp/translations/it.json b/guacamole/src/main/webapp/translations/it.json index bea3aad65..4dff9f94a 100644 --- a/guacamole/src/main/webapp/translations/it.json +++ b/guacamole/src/main/webapp/translations/it.json @@ -30,6 +30,8 @@ "FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_PASSWORD_AGAIN" : "Re-inserisci la password:", + "FIELD_PLACEHOLDER_FILTER" : "Filtro", + "FORMAT_DATE_TIME_PRECISE" : "dd-MM-yyyy HH:mm:ss", "INFO_ACTIVE_USER_COUNT" : "Ora utilizzato da {USERS} {USERS, plural, one{user} other{users}}.", @@ -456,6 +458,12 @@ }, + "SETTINGS_CONNECTION_HISTORY" : { + + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER" + + }, + "SETTINGS_PREFERENCES" : { "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", @@ -518,7 +526,7 @@ "DIALOG_HEADER_CONFIRM_DELETE" : "Termina Sessione", "DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR", - "FIELD_PLACEHOLDER_FILTER" : "Filtro", + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json index c2dded721..255d08fdd 100644 --- a/guacamole/src/main/webapp/translations/nl.json +++ b/guacamole/src/main/webapp/translations/nl.json @@ -30,6 +30,8 @@ "FIELD_HEADER_PASSWORD" : "Wachtwoord:", "FIELD_HEADER_PASSWORD_AGAIN" : "Nogmaals uw wachtwoord:", + "FIELD_PLACEHOLDER_FILTER" : "Filter", + "FORMAT_DATE_TIME_PRECISE" : "yyyy-MM-dd HH:mm:ss", "INFO_ACTIVE_USER_COUNT" : "Op dit moment in gebruik door {USERS} {USERS, plural, one{gebruiker} other{gebruikers}}.", @@ -447,6 +449,12 @@ }, + "SETTINGS_CONNECTION_HISTORY" : { + + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER" + + }, + "SETTINGS_PREFERENCES" : { "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", @@ -509,7 +517,7 @@ "DIALOG_HEADER_CONFIRM_DELETE" : "Beeindig Sessie", "DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR", - "FIELD_PLACEHOLDER_FILTER" : "Filter", + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json index d1607fe85..22883b910 100644 --- a/guacamole/src/main/webapp/translations/ru.json +++ b/guacamole/src/main/webapp/translations/ru.json @@ -29,6 +29,8 @@ "FIELD_HEADER_PASSWORD" : "Пароль:", "FIELD_HEADER_PASSWORD_AGAIN" : "Повтор пароля:", + "FIELD_PLACEHOLDER_FILTER" : "Фильтр", + "FORMAT_DATE_TIME_PRECISE" : "yyyy-MM-dd HH:mm:ss", "INFO_ACTIVE_USER_COUNT" : "Подключено пользователей {USERS}.", @@ -424,6 +426,12 @@ }, + "SETTINGS_CONNECTION_HISTORY" : { + + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER" + + }, + "SETTINGS_PREFERENCES" : { "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE", @@ -486,7 +494,7 @@ "DIALOG_HEADER_CONFIRM_DELETE" : "Завершение сессий", "DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR", - "FIELD_PLACEHOLDER_FILTER" : "Фильтр", + "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", "FORMAT_STARTDATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",