Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix localization issues (#148)

Browse Source
This commit is contained in:
Athou
2013-05-24 12:34:04 +02:00
parent 8039915bcf
commit f5951f178c
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java
View File

@@ -101,7 +101,7 @@ public class InternationalizationDevelopmentFilter implements Filter {
String var = m.group(1); String var = m.group(1);
Object replacement = props.get(var); Object replacement = props.get(var);
String replacementValue = replacement == null ? var : replacement String replacementValue = replacement == null ? var : replacement
.toString().split("#")[0].trim(); .toString().split("#")[0];
m.appendReplacement(sb, replacementValue); m.appendReplacement(sb, replacementValue);
} }
m.appendTail(sb); m.appendTail(sb);

2
src/main/resources/i18n/en.properties
View File

@@ -87,7 +87,7 @@ about.keyboard_shortcuts=Keyboard shortcuts
about.line1_prefix=CommaFeed is an open-source project. Sources are hosted on about.line1_prefix=CommaFeed is an open-source project. Sources are hosted on
about.line1_suffix=. about.line1_suffix=.
about.line2_prefix=If you encounter an issue, please report it on the issues page of the about.line2_prefix=If you encounter an issue, please report it on the issues page of the
about.line2_suffix= project. about.line2_suffix=\ project.
about.line3=If you like this project, please consider a donation to support the developer and help cover the costs of keeping this website online. about.line3=If you like this project, please consider a donation to support the developer and help cover the costs of keeping this website online.
about.goodies=Goodies about.goodies=Goodies
about.goodies.subscribe_url=Subscribe URL about.goodies.subscribe_url=Subscribe URL

2
src/main/script/HTMLConcat.groovy
View File

@@ -44,7 +44,7 @@ public class HTMLConcat {
while (m.find()) { while (m.find()) {
String var = m.group(1); String var = m.group(1);
Object replacement = props.get(var); Object replacement = props.get(var);
m.appendReplacement(sb, replacement == null ? var : replacement.toString().split("#")[0].trim()); m.appendReplacement(sb, replacement == null ? var : replacement.toString().split("#")[0]);
} }
m.appendTail(sb); m.appendTail(sb);
return sb.toString(); return sb.toString();

4
src/main/webapp/templates/feeds.help.html
View File

@@ -2,10 +2,10 @@
<div class="span6"> <div class="span6">
<h4><i class="icon-question-sign"></i> ${toolbar.about}</h4> <h4><i class="icon-question-sign"></i> ${toolbar.about}</h4>
<p> <p>
${about.line1_prefix} <a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a> ${about.line1_suffix} ${about.line1_prefix}<a href="https://github.com/Athou/commafeed" target="_blank">GitHub</a>${about.line1_suffix}
</p> </p>
<p> <p>
${about.line2_prefix} <a href="https://github.com/Athou/commafeed/issues" target="_blank">GitHub</a> ${about.line2_suffix} ${about.line2_prefix}<a href="https://github.com/Athou/commafeed/issues" target="_blank">GitHub</a>${about.line2_suffix}
</p> </p>
<h4><i class="icon-money"></i> ${toolbar.donate}</h4> <h4><i class="icon-money"></i> ${toolbar.donate}</h4>