diff options
| author | azul <azul@leap.se> | 2014-07-18 12:21:49 +0200 |
|---|---|---|
| committer | azul <azul@leap.se> | 2014-07-18 12:21:49 +0200 |
| commit | bbd41c9bfd2cb88a88d7436dd58a8b46a5d10cf1 (patch) | |
| tree | 00b39da219151473437c02ce35344117bcd5b2fa /config | |
| parent | ade74d8a9091ae607586d7b287a0579a2ee7af8e (diff) | |
| parent | 20352249fa5dafe3abb2d4b751b1e5c8c0a59abc (diff) | |
Merge pull request #180 from azul/feature/messages-api
Feature/messages api
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/add_controller_methods.rb | 1 | ||||
| -rw-r--r-- | config/locales/errors.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/messages.en.yml | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/add_controller_methods.rb b/config/initializers/add_controller_methods.rb index f107544..4ad4213 100644 --- a/config/initializers/add_controller_methods.rb +++ b/config/initializers/add_controller_methods.rb @@ -2,5 +2,6 @@ ActiveSupport.on_load(:application_controller) do include ControllerExtension::Authentication include ControllerExtension::TokenAuthentication include ControllerExtension::Flash + include ControllerExtension::JsonResponses include ControllerExtension::Errors end diff --git a/config/locales/errors.en.yml b/config/locales/errors.en.yml index 93feab1..e0a909f 100644 --- a/config/locales/errors.en.yml +++ b/config/locales/errors.en.yml @@ -9,3 +9,4 @@ en: text: not_found: "You may have mistyped the address or the page may have moved." server_error: The problem has been logged and we will look into it. + not_found: Not found. diff --git a/config/locales/messages.en.yml b/config/locales/messages.en.yml new file mode 100644 index 0000000..d9d7613 --- /dev/null +++ b/config/locales/messages.en.yml @@ -0,0 +1,4 @@ +en: + messages: + not_found: That message could not be found. + marked_as_read: Message has been marked as read. |