GUACAMOLE-36: Merge new system for fully translatable error messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/403c578d Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/403c578d Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/403c578d Branch: refs/heads/master Commit: 403c578da91099aa802833e36ef623bcfd5b6147 Parents: f891f69 89d3ba4 Author: James Muehlner <[email protected]> Authored: Tue Jan 3 19:57:42 2017 -0800 Committer: James Muehlner <[email protected]> Committed: Tue Jan 3 19:57:42 2017 -0800 ---------------------------------------------------------------------- .../apache/guacamole/language/Translatable.java | 41 +++++ .../guacamole/language/TranslatableMessage.java | 96 ++++++++++ .../org/apache/guacamole/rest/APIError.java | 183 +++++++++++-------- .../org/apache/guacamole/rest/APIException.java | 100 ++-------- .../guacamole/rest/RESTExceptionWrapper.java | 116 ++---------- .../APIConnectionRecordSortPredicate.java | 7 +- .../app/client/controllers/clientController.js | 16 +- .../app/index/controllers/indexController.js | 4 +- .../main/webapp/app/login/directives/login.js | 10 +- .../main/webapp/app/login/templates/login.html | 6 +- .../controllers/manageConnectionController.js | 8 +- .../manageConnectionGroupController.js | 8 +- .../manageSharingProfileController.js | 8 +- .../manage/controllers/manageUserController.js | 15 +- .../notification/services/guacNotification.js | 4 +- .../templates/guacNotification.html | 4 +- .../app/notification/types/Notification.js | 2 +- .../src/main/webapp/app/rest/types/Error.js | 9 + .../app/rest/types/TranslatableMessage.js | 63 +++++++ .../directives/guacSettingsPreferences.js | 14 +- .../settings/directives/guacSettingsSessions.js | 6 +- 21 files changed, 420 insertions(+), 300 deletions(-) ----------------------------------------------------------------------
