* Fix concats

Refs matomo-org#4019
sabl0r · Jun 28, 2013 · 6aee04b · 6aee04b
1 parent a62f1c1
commit 6aee04b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
@@ -27,7 +27,16 @@
                 {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>{{ latest_version_available }}</a>")|raw }}
             {% endif %}
         {% else %}
-            {{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org' target='_blank'>",piwik_version+"</a>","<br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>","</a>",'<br/>',"<a href='http://piwik.org/donate/' target='_blank'><strong><em>","</em></strong></a>")|raw }}
+            {{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate'|translate(
+                    "<a href='?module=Proxy&action=redirect&url=http://piwik.org' target='_blank'>",
+                    piwik_version~"</a>",
+                    "<br />",
+                    "<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/contribute/'>",
+                    "</a>",
+                    '<br/>',
+                    "<a href='http://piwik.org/donate/' target='_blank'><strong><em>",
+                    "</em></strong></a>"
+                )|raw }}
         {% endif %}
         {% if hasSomeAdminAccess %}
             <br/>

diff --git a/plugins/PDFReports/templates/_addReport.twig b/plugins/PDFReports/templates/_addReport.twig
@@ -132,7 +132,8 @@
                                             <label for="{{ reportType }}{{ report.uniqueId }}">
                                                 {{ report.name }}
                                                 {% if report.uniqueId=='MultiSites_getAll' %}
-                                                    <div class="entityInlineHelp">{{ 'PDFReports_ReportIncludeNWebsites'|translate('"'+countWebsites+' "') }}</div>
+                                                    <div class="entityInlineHelp">{{ 'PDFReports_ReportIncludeNWebsites'|translate('"'~countWebsites~' "')
+                                                        }}</div>
                                                 {% endif %}
                                             </label>
                                         </li>

diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
@@ -120,7 +120,7 @@
         </div>
         <div id="geoipdb-screen2-download" style="display:none">
             <p class='loadingPiwik'><img src='./plugins/Zeitgeist/images/loading-blue.gif'/>
-            {{ 'UserCountry_DownloadingDb'|translate('<a href="'+geoLiteUrl+'">GeoLiteCity.dat</a>')|raw }}...</p>
+            {{ 'UserCountry_DownloadingDb'|translate('<a href="'~geoLiteUrl~'">GeoLiteCity.dat</a>')|raw }}...</p>
 	        <div id="geoip-download-progress"></div>
         </div>
     {% endif %}