Hi,
I was unable to apply this patch on top of master branch. Could you
rebase and resend?
[alinefm@alinefm-TP440 wok]$ git am -3
/home/alinefm/mail-patches/\[PATCH\ v2\]\ \[Wok\]\ Externalise\ missed\
strings\ in\ Wok..eml
Applying: Externalise missed strings in Wok.
Using index info to reconstruct a base tree...
M ui/pages/wok-ui.html.tmpl
Falling back to patching base and 3-way merge...
Auto-merging ui/pages/wok-ui.html.tmpl
CONFLICT (content): Merge conflict in ui/pages/wok-ui.html.tmpl
error: Failed to merge in the changes.
Patch failed at 0001 Externalise missed strings in Wok.
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[alinefm@alinefm-TP440 wok]$ git am --abort
On 10/26/2016 06:26 AM, pkulkark(a)linux.vnet.ibm.com wrote:
From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com>
v2:
Included space in title field
v1:
This patch externalises some more static
strings missed in Wok and removes tooltip.
Signed-off-by: Pooja Kulkarni <pkulkark(a)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 170f8fe..431806c 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 22a67e7..9ac7157 100644
--- a/ui/pages/wok-ui.html.tmpl
+++ b/ui/pages/wok-ui.html.tmpl
@@ -168,8 +168,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>
@@ -215,10 +215,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>