ROL-2087 "macro.weblog.searchgoogle" in translated ApplicationResources 
produces wrong Google URL


git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1720882 
13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/97c5cab4
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/97c5cab4
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/97c5cab4

Branch: refs/heads/bootstrap-ui
Commit: 97c5cab4a9a2311a173356af7b015db9a5bf3e7c
Parents: 571d8a8
Author: Kohei Nozaki <[email protected]>
Authored: Sat Dec 19 02:49:01 2015 +0000
Committer: Kohei Nozaki <[email protected]>
Committed: Sat Dec 19 02:49:01 2015 +0000

----------------------------------------------------------------------
 app/src/main/resources/ApplicationResources_de.properties    | 2 +-
 app/src/main/resources/ApplicationResources_es.properties    | 2 +-
 app/src/main/resources/ApplicationResources_fr.properties    | 2 +-
 app/src/main/resources/ApplicationResources_ja.properties    | 2 +-
 app/src/main/resources/ApplicationResources_ko.properties    | 2 +-
 app/src/main/resources/ApplicationResources_ru.properties    | 2 +-
 app/src/main/resources/ApplicationResources_zh_CN.properties | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller/blob/97c5cab4/app/src/main/resources/ApplicationResources_de.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources_de.properties 
b/app/src/main/resources/ApplicationResources_de.properties
index 887f2bf..e5c9cfa 100644
--- a/app/src/main/resources/ApplicationResources_de.properties
+++ b/app/src/main/resources/ApplicationResources_de.properties
@@ -471,7 +471,7 @@ macro.weblog.readMoreLink=<span class="readmore">[<a 
class="readmore" href="{0}"
 macro.weblog.rememberinfo=Eingaben merken?
 macro.weblog.searchalert=Bitte geben Sie einen Suchbegriff ein um fortzufahren.
 macro.weblog.searchbutton=Suche
-macro.weblog.searchgoogle=<em>Sie k\u00F6nnen <a 
href="http://google.com/search?q={0}%20site:{1}/page/{3}"; class="google">die 
gleiche Suche</a> auch auf Google ausf\u00FChren.</em>
+macro.weblog.searchgoogle=<em>Sie k\u00F6nnen <a 
href="http://google.com/search?q={0}%20site:{1}/{3}"; class="google">die gleiche 
Suche</a> auch auf Google ausf\u00FChren.</em>
 macro.weblog.searchhits=<strong>{1}</strong> Eintr\u00E4ge f\u00FCr "{0}" 
gefunden.
 macro.weblog.url=URL:
 macro.weblog.yourcomment=Ihr Kommentar:

http://git-wip-us.apache.org/repos/asf/roller/blob/97c5cab4/app/src/main/resources/ApplicationResources_es.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources_es.properties 
b/app/src/main/resources/ApplicationResources_es.properties
index a56f2d6..bdf6ec7 100644
--- a/app/src/main/resources/ApplicationResources_es.properties
+++ b/app/src/main/resources/ApplicationResources_es.properties
@@ -253,7 +253,7 @@ macro.weblog.post=Enviar
 macro.weblog.searchalert=Por favor, introduzca un t\u00E9rmino que buscar para 
continuar.
 macro.weblog.searchbutton=Buscar
 macro.weblog.searchhits="{0}": <strong>{1}</strong> entradas encontradas.
-macro.weblog.searchgoogle=<em>Tambi\u00E9n puede <a 
href\="http\://google.com/search?q\={0}%20site\:{1}/page/{3}" 
class\="google">probar la misma b\u00FAsqueda</a> en Google.</em>
+macro.weblog.searchgoogle=<em>Tambi\u00E9n puede <a 
href\="http\://google.com/search?q\={0}%20site\:{1}/{3}" class\="google">probar 
la misma b\u00FAsqueda</a> en Google.</em>
 macro.weblog.notifyMeOfComments=Avisarme de nuevos comentarios por correo 
electr\u00F3nico
 mainPage.category=Categor\u00EDa
 mainPage.searchWeblogs=Buscar blogs

http://git-wip-us.apache.org/repos/asf/roller/blob/97c5cab4/app/src/main/resources/ApplicationResources_fr.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources_fr.properties 
b/app/src/main/resources/ApplicationResources_fr.properties
index a0f0482..32cf84a 100644
--- a/app/src/main/resources/ApplicationResources_fr.properties
+++ b/app/src/main/resources/ApplicationResources_fr.properties
@@ -515,7 +515,7 @@ macro.weblog.searchbutton=Rechercher
 #FIXME
 macro.weblog.searchhits="{0}": <strong>{1}</strong> entrées trouvées.
 macro.weblog.searchgoogle=<em>Vous pouvez aussi \
-<a href="http://google.com/search?q={0}%20site:{1}/page/{3}"; \
+<a href="http://google.com/search?q={0}%20site:{1}/{3}"; \
 class="google">essayer cette recherche</a> sur Google.</em>
 #FIXME
 macro.weblog.notifyMeOfComments=Notifiez moi par courriel de nouveaux 
commentaires

http://git-wip-us.apache.org/repos/asf/roller/blob/97c5cab4/app/src/main/resources/ApplicationResources_ja.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources_ja.properties 
b/app/src/main/resources/ApplicationResources_ja.properties
index 0b0e64a..03c7790 100644
--- a/app/src/main/resources/ApplicationResources_ja.properties
+++ b/app/src/main/resources/ApplicationResources_ja.properties
@@ -413,7 +413,7 @@ macro.weblog.postcommentHeader=\u30B3\u30E1\u30F3\u30C8
 macro.weblog.post=\u6295\u7A3F
 macro.weblog.searchbutton=\u691C\u7D22
 macro.weblog.searchhits="{0}": 
<strong>{1}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
-macro.weblog.searchgoogle=<em>Google\u3067<a 
href="http://www.google.co.jp/search?q={0}%20site:{1}/page/{3}"; 
class="google">\u540C\u3058\u30AF\u30A8\u30EA\u30EF\u30FC\u30C9\u3067\u691C\u7D22</a>\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</em>
+macro.weblog.searchgoogle=<em>Google\u3067<a 
href="http://www.google.co.jp/search?q={0}%20site:{1}/{3}"; 
class="google">\u540C\u3058\u30AF\u30A8\u30EA\u30EF\u30FC\u30C9\u3067\u691C\u7D22</a>\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</em>
 
macro.weblog.notifyMeOfComments=\u65B0\u3057\u3044\u30B3\u30E1\u30F3\u30C8\u3092\u30E1\u30FC\u30EB\u3067\u901A\u77E5\u3059\u308B
 
 # -------------------------------------------------------------------- Main 
page

http://git-wip-us.apache.org/repos/asf/roller/blob/97c5cab4/app/src/main/resources/ApplicationResources_ko.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources_ko.properties 
b/app/src/main/resources/ApplicationResources_ko.properties
index f3c854a..5cad3a1 100644
--- a/app/src/main/resources/ApplicationResources_ko.properties
+++ b/app/src/main/resources/ApplicationResources_ko.properties
@@ -593,7 +593,7 @@ macro.weblog.searchalert=\uac80\uc0c9\uc5b4\ub97c 
\uc785\ub825\ud558\uc2ed\uc2dc
 macro.weblog.searchbutton=\uac80\uc0c9
 macro.weblog.searchhits="{0}": <strong>{1}</strong> \uae30\uc0ac\uac00 
\ubc1c\uacac\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 macro.weblog.searchgoogle=<em>Google\uc744 \ud1b5\ud574 \
-<a href="http://google.com/search?q={0}%20site:{1}/page/{3}"; \
+<a href="http://google.com/search?q={0}%20site:{1}/{3}"; \
 class="google">\ub3d9\uc77c \uac80\uc0c9\uc5b4\ub85c \uac80\uc0c9</a>\ud560 
\uc218 \uc788\uc2b5\ub2c8\ub2e4.</em>
 macro.weblog.notifyMeOfComments=\uc0c8\ub85c\uc6b4 \uc758\uacac\uc5d0 
\ub300\ud574 \uc804\uc790\uc6b0\ud3b8\uc73c\ub85c \uc54c\ub9ac\uae30
 

http://git-wip-us.apache.org/repos/asf/roller/blob/97c5cab4/app/src/main/resources/ApplicationResources_ru.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources_ru.properties 
b/app/src/main/resources/ApplicationResources_ru.properties
index bee7cec..efa850c 100644
--- a/app/src/main/resources/ApplicationResources_ru.properties
+++ b/app/src/main/resources/ApplicationResources_ru.properties
@@ -334,7 +334,7 @@ 
macro.weblog.searchalert=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\
 macro.weblog.searchbutton=\u041F\u043E\u0438\u0441\u043A
 macro.weblog.searchhits="{0}": <strong>{1}</strong> 
\u0437\u0430\u043F\u0438\u0441\u0435\u0439 
\u043D\u0430\u0439\u0434\u0435\u043D\u043E.
 macro.weblog.searchgoogle=<em>\u0412\u044B 
\u043C\u043E\u0436\u0435\u0442\u0435 \u0442\u0430\u043A\u0436\u0435 \
-<a href="http://google.com/search?q={0}%20site:{1}/page/{3}"; \
+<a href="http://google.com/search?q={0}%20site:{1}/{3}"; \
 class="google">\u043F\u043E\u043F\u044B\u0442\u0430\u0442\u044C\u0441\u044F 
\u043F\u043E\u0438\u0441\u043A\u0430\u0442\u044C  </a> \u043D\u0430 \
 Google.</em>
 
macro.weblog.notifyMeOfComments=\u0418\u0437\u0432\u0435\u0441\u0442\u0438\u0442\u044C
 \u043C\u0435\u043D\u044F \u043F\u043E email \u043E 
\u043D\u043E\u0432\u044B\u0445 
\u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u044F\u0445

http://git-wip-us.apache.org/repos/asf/roller/blob/97c5cab4/app/src/main/resources/ApplicationResources_zh_CN.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources_zh_CN.properties 
b/app/src/main/resources/ApplicationResources_zh_CN.properties
index 5a22874..470a468 100644
--- a/app/src/main/resources/ApplicationResources_zh_CN.properties
+++ b/app/src/main/resources/ApplicationResources_zh_CN.properties
@@ -259,7 +259,7 @@ macro.weblog.preview=\u9884\u89C8
 macro.weblog.rememberinfo=\u8BB0\u4E0B\u60A8\u7684\u4FE1\u606F\uFF1F
 macro.weblog.searchalert=\u8BF7\u8F93\u5165\u641C\u7D22\u6761\u76EE.
 macro.weblog.searchbutton=\u641C\u7D22
-macro.weblog.searchgoogle=<em>\u60A8\u4E5F\u53EF\u4EE5\u4F7F\u7528Google\u6765\u641C\u7D22<a
 href="http://google.com/search?q={0}%20site:{1}/{2}/{3}"; 
class="google">\u8FD9\u4E2A\u94FE\u63A5</a>\u3002</em>
+macro.weblog.searchgoogle=<em>\u60A8\u4E5F\u53EF\u4EE5\u4F7F\u7528Google\u6765\u641C\u7D22<a
 href="http://google.com/search?q={0}%20site:{1}/{3}"; 
class="google">\u8FD9\u4E2A\u94FE\u63A5</a>\u3002</em>
 macro.weblog.searchhits="{0}": 
\u627E\u5230<strong>{1}</strong>\u6761\u65E5\u5FD7\u3002
 macro.weblog.url=URL\uFF1A
 macro.weblog.yourcomment=\u60A8\u7684\u8BC4\u8BBA\uFF1A

Reply via email to