[PATCH] [Wok] Externalise missed strings in Wok.
From: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com> This patch externalises some more static strings missed in Wok. Signed-off-by: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 6 +++--- ui/pages/wok-ui.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 6890d9b..d61b22b 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -111,12 +111,12 @@ <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> <label for="username" class="sr-only">$_("User Name")</label> - <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" /> + <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" title="" /> <div id="username-msg" class="msg-required"></div> </div> <div class="form-group"> <label for="password" class="sr-only">$_("Password")</label> - <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" /> + <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" title=""/> <div id="password-msg" class="msg-required"></div> </div> <div class="form-group"> @@ -322,7 +322,7 @@ </div> <div class="row"> <div class="col-lg-4 delayed-fadein"> - <p class="text-muted powered hidden">Powered by:</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="wok-logos" class="list-inline"></ul> </div> </div> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index e238a34..eaf8815 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -174,8 +174,8 @@ </div> <div id="buildme" style="display:none"> - <div><p>Oops! It looks like I am running from a source tree and you forgot to build! - Please run the following command from the wok and plugins directories and reload this page:</p> + <div><p>$_("Oops! It looks like I am running from a source tree and you forgot to build!") + $_("Please run the following command from the wok and plugins directories and reload this page:")</p> <p><code>make</code></p> </div> </div> @@ -221,10 +221,10 @@ </script> <footer class="footer"> <div class="container"> - <p class="text-muted powered hidden">$_("Powered by"):</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="plugins"> </ul> - <span class="wok-version">Wok Version: $get_version()</span> + <span class="wok-version">$_("Wok Version:") $get_version()</span> </div> </footer> </body> -- 2.1.0
Patch looks good. Just a question: On 08/02/2016 02:05 AM, pkulkark@linux.vnet.ibm.com wrote:
From: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com>
This patch externalises some more static strings missed in Wok.
Signed-off-by: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 6 +++--- ui/pages/wok-ui.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 6890d9b..d61b22b 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -111,12 +111,12 @@ <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> <label for="username" class="sr-only">$_("User Name")</label> - <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" /> + <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" title="" /> <div id="username-msg" class="msg-required"></div> </div> <div class="form-group"> <label for="password" class="sr-only">$_("Password")</label> - <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" /> + <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" title=""/> I've noticed the extra
title="" In both username and password inputs. I haven't seen any difference in the UI with them. Why have you added this empty attribute in those tags?
<div id="password-msg" class="msg-required"></div> </div> <div class="form-group"> @@ -322,7 +322,7 @@ </div> <div class="row"> <div class="col-lg-4 delayed-fadein"> - <p class="text-muted powered hidden">Powered by:</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="wok-logos" class="list-inline"></ul> </div> </div> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index e238a34..eaf8815 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -174,8 +174,8 @@ </div>
<div id="buildme" style="display:none"> - <div><p>Oops! It looks like I am running from a source tree and you forgot to build! - Please run the following command from the wok and plugins directories and reload this page:</p> + <div><p>$_("Oops! It looks like I am running from a source tree and you forgot to build!") + $_("Please run the following command from the wok and plugins directories and reload this page:")</p> <p><code>make</code></p> </div> </div> @@ -221,10 +221,10 @@ </script> <footer class="footer"> <div class="container"> - <p class="text-muted powered hidden">$_("Powered by"):</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="plugins"> </ul> - <span class="wok-version">Wok Version: $get_version()</span> + <span class="wok-version">$_("Wok Version:") $get_version()</span> </div> </footer> </body>
On 08/02/2016 10:03 PM, Daniel Henrique Barboza wrote:
Patch looks good. Just a question:
On 08/02/2016 02:05 AM, pkulkark@linux.vnet.ibm.com wrote:
From: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com>
This patch externalises some more static strings missed in Wok.
Signed-off-by: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 6 +++--- ui/pages/wok-ui.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 6890d9b..d61b22b 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -111,12 +111,12 @@ <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> <label for="username" class="sr-only">$_("User Name")</label> - <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" /> + <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" title="" /> <div id="username-msg" class="msg-required"></div> </div> <div class="form-group"> <label for="password" class="sr-only">$_("Password")</label> - <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" /> + <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" title=""/> I've noticed the extra
title=""
In both username and password inputs. I haven't seen any difference in the UI with them. Why have you added this empty attribute in those tags? Previously, a tooltip would appear(in english) for these fields when you hover the mouse over them, which was due to the browser default behavior. By adding this attribute, it removes this default behavior.
<div id="password-msg" class="msg-required"></div> </div> <div class="form-group"> @@ -322,7 +322,7 @@ </div> <div class="row"> <div class="col-lg-4 delayed-fadein"> - <p class="text-muted powered hidden">Powered by:</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="wok-logos" class="list-inline"></ul> </div> </div> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index e238a34..eaf8815 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -174,8 +174,8 @@ </div> <div id="buildme" style="display:none"> - <div><p>Oops! It looks like I am running from a source tree and you forgot to build! - Please run the following command from the wok and plugins directories and reload this page:</p> + <div><p>$_("Oops! It looks like I am running from a source tree and you forgot to build!") + $_("Please run the following command from the wok and plugins directories and reload this page:")</p> <p><code>make</code></p> </div> </div> @@ -221,10 +221,10 @@ </script> <footer class="footer"> <div class="container"> - <p class="text-muted powered hidden">$_("Powered by"):</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="plugins"> </ul> - <span class="wok-version">Wok Version: $get_version()</span> + <span class="wok-version">$_("Wok Version:") $get_version()</span> </div> </footer> </body>
_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel
On 08/03/2016 02:04 AM, Pooja Kulkarni wrote:
On 08/02/2016 10:03 PM, Daniel Henrique Barboza wrote:
Patch looks good. Just a question:
On 08/02/2016 02:05 AM, pkulkark@linux.vnet.ibm.com wrote:
From: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com>
This patch externalises some more static strings missed in Wok.
Signed-off-by: Pooja Kulkarni <pkulkark@linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 6 +++--- ui/pages/wok-ui.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 6890d9b..d61b22b 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -111,12 +111,12 @@ <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> <label for="username" class="sr-only">$_("User Name")</label> - <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" /> + <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" title="" /> <div id="username-msg" class="msg-required"></div> </div> <div class="form-group"> <label for="password" class="sr-only">$_("Password")</label> - <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" /> + <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" title=""/> I've noticed the extra
title=""
In both username and password inputs. I haven't seen any difference in the UI with them. Why have you added this empty attribute in those tags? Previously, a tooltip would appear(in english) for these fields when you hover the mouse over them, which was due to the browser default behavior. By adding this attribute, it removes this default behavior.
Yeah, this is why I asked. In my 2 browsers here (Chrome and FIrefox) the tooltip still appears even with this patch. What worked here was to set title=" " (an empty space). Leaving title="" would display the english tooltip anyway. I believe this is a browser specific behavior. Actually, in theory, the browser shouldn't display any tooltip if you don't supply the title tag. What we had today should provide no tooltip. I will ask you to try in your environment setting title=" " and see if it works. If affirmative, send a v2. Otherwise let me know and perhaps we can upstream this patch as is, accepting that browser behavior can't be predicted. Daniel
<div id="password-msg" class="msg-required"></div> </div> <div class="form-group"> @@ -322,7 +322,7 @@ </div> <div class="row"> <div class="col-lg-4 delayed-fadein"> - <p class="text-muted powered hidden">Powered by:</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="wok-logos" class="list-inline"></ul> </div> </div> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index e238a34..eaf8815 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -174,8 +174,8 @@ </div> <div id="buildme" style="display:none"> - <div><p>Oops! It looks like I am running from a source tree and you forgot to build! - Please run the following command from the wok and plugins directories and reload this page:</p> + <div><p>$_("Oops! It looks like I am running from a source tree and you forgot to build!") + $_("Please run the following command from the wok and plugins directories and reload this page:")</p> <p><code>make</code></p> </div> </div> @@ -221,10 +221,10 @@ </script> <footer class="footer"> <div class="container"> - <p class="text-muted powered hidden">$_("Powered by"):</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="plugins"> </ul> - <span class="wok-version">Wok Version: $get_version()</span> + <span class="wok-version">$_("Wok Version:") $get_version()</span> </div> </footer> </body>
_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel
_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel
participants (3)
-
Daniel Henrique Barboza -
pkulkark＠linux.vnet.ibm.com -
Pooja Kulkarni