summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-02-18 13:34:56 -0600
committerEndi S. Dewata <edewata@redhat.com>2011-02-21 15:53:00 -0500
commit88870b1abedb22c3a1d77928c35ed1b1ab87f79e (patch)
tree697b17b348e7d2d1b468816386fd64822206830f
parent6ff85906998a43c0ece575b07b9ef6788c59d39d (diff)
downloadfreeipa-88870b1abedb22c3a1d77928c35ed1b1ab87f79e.zip
freeipa-88870b1abedb22c3a1d77928c35ed1b1ab87f79e.tar.gz
freeipa-88870b1abedb22c3a1d77928c35ed1b1ab87f79e.tar.xz
Fixed error message for invalid Kerberos ticket.
https://fedorahosted.org/freeipa/ticket/490
-rw-r--r--install/ui/test/data/i18n_messages.json2
-rw-r--r--install/ui/test/data/ipa_init.json2
-rw-r--r--ipalib/plugins/internal.py13
3 files changed, 9 insertions, 8 deletions
diff --git a/install/ui/test/data/i18n_messages.json b/install/ui/test/data/i18n_messages.json
index 1cceb89..da20f13 100644
--- a/install/ui/test/data/i18n_messages.json
+++ b/install/ui/test/data/i18n_messages.json
@@ -4,7 +4,7 @@
"result": {
"messages": {
"ajax": {
- "401": "Your kerberos ticket no longer valid.Please run KInit and then click 'retry'If this is your first time running the IPA Web UI<a href='/ipa/errors/ssbrowser.html'> Follow these directions</a> to configure your browser."
+ "401": "Your kerberos ticket is no longer valid. Please run kinit and then click 'retry'. If this is your first time running the IPA Web UI <a href='/ipa/config/unauthorized.html'>follow these directions</a> to configure your browser."
},
"association": {
"add": "Add ${other_entity} into ${entity} ${primary_key}",
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 1428a53..59c4b20 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -9467,7 +9467,7 @@
{
"messages": {
"ajax": {
- "401": "Your kerberos ticket no longer valid.Please run KInit and then click 'retry'If this is your first time running the IPA Web UI<a href='/ipa/errors/ssbrowser.html'> Follow these directions</a> to configure your browser."
+ "401": "Your kerberos ticket is no longer valid. Please run kinit and then click 'retry'. If this is your first time running the IPA Web UI <a href='/ipa/config/unauthorized.html'>follow these directions</a> to configure your browser."
},
"association": {
"add": "Add ${other_entity} into ${entity} ${primary_key}",
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index e8b34a0..89330ba 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -1,6 +1,7 @@
# Authors:
# Pavel Zuna <pzuna@redhat.com>
-# Adam YOung <ayoung@redhat.com>
+# Adam Young <ayoung@redhat.com>
+# Endi S. Dewata <edewata@redhat.com>
#
# Copyright (c) 2010 Red Hat
# See file 'copying' for use and warranty information
@@ -373,11 +374,11 @@ class i18n_messages(Command):
"validation_error":_("Text does not match field pattern"),
},
"ajax":{
- "401":_("Your kerberos ticket no longer valid."+
- "Please run KInit and then click 'retry'"+
- "If this is your first time running the IPA Web UI"+
- "<a href='/ipa/errors/ssbrowser.html'> "+
- "Follow these directions</a> to configure your browser.")
+ "401":_("Your kerberos ticket is no longer valid. "+
+ "Please run kinit and then click 'retry'. "+
+ "If this is your first time running the IPA Web UI "+
+ "<a href='/ipa/config/unauthorized.html'>"+
+ "follow these directions</a> to configure your browser.")
},
"dirty":_("This page has unsaved changes. Please save or revert."),
}