From 88870b1abedb22c3a1d77928c35ed1b1ab87f79e Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 18 Feb 2011 13:34:56 -0600
Subject: Fixed error message for invalid Kerberos ticket.

https://fedorahosted.org/freeipa/ticket/490
---
 install/ui/test/data/i18n_messages.json |  2 +-
 install/ui/test/data/ipa_init.json      |  2 +-
 ipalib/plugins/internal.py              | 13 +++++++------
 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 1cceb8974..da20f1374 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 1428a538a..59c4b20b5 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 e8b34a09b..89330bab0 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."),
         }
-- 
cgit