diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-14 01:12:32 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-14 01:12:32 +0000 |
| commit | 2898fe3b82ce10d045dd2c274a3290bacf209a00 (patch) | |
| tree | 5aced91bb92d8c9136cabf60ebc918248328907a /modules/gallery/controllers/admin_languages.php | |
| parent | 47cbef684d41a4d51a9848091997e10b909abf32 (diff) | |
| parent | e4a43c99e421c830e569eaae6294286ed51e0ad8 (diff) | |
Git pull from devel line.
Diffstat (limited to 'modules/gallery/controllers/admin_languages.php')
| -rw-r--r-- | modules/gallery/controllers/admin_languages.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php index 573ededf..f96a0eb7 100644 --- a/modules/gallery/controllers/admin_languages.php +++ b/modules/gallery/controllers/admin_languages.php @@ -74,9 +74,11 @@ class Admin_Languages_Controller extends Admin_Controller { private function _save_api_key($form) { $new_key = $form->sharing->api_key->value; - if ($new_key && !l10n_client::validate_api_key($new_key)) { - $form->sharing->api_key->add_error("invalid", 1); - $valid = false; + if ($new_key) { + list($connected, $valid) = l10n_client::validate_api_key($new_key); + if (!$valid) { + $form->sharing->api_key->add_error($connected ? "invalid" : "no_connection", 1); + } } else { $valid = true; } @@ -119,7 +121,9 @@ class Admin_Languages_Controller extends Admin_Controller { array("server-link" => html::mark_clean(html::anchor($server_link)))) : t("API key")) ->value($api_key) - ->error_messages("invalid", t("The API key you provided is invalid.")); + ->error_messages("invalid", t("The API key you provided is invalid.")) + ->error_messages( + "no_connection", t("Could not connect to remote server to validate the API key.")); $group->submit("save")->value(t("Save settings")); if ($api_key && $this->_outgoing_translations_count()) { // TODO: UI improvement: hide API key / save button when API key is set. |