garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests 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);
Object replacement = props.get(var);
String replacementValue = replacement == null ? var : replacement
.toString().split("#")[0].trim();
.toString().split("#")[0];
m.appendReplacement(sb, replacementValue);
}
m.appendTail(sb);

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

@@ -84,10 +84,10 @@ profile.delete_account=Delete account
about.rest_api=REST API
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.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.goodies=Goodies
about.goodies.subscribe_url=Subscribe URL

4
src/main/resources/i18n/fr.properties
View File

@@ -16,7 +16,7 @@ subscribe.feed_url=URL du flux
subscribe.feed_name=Nom du flux
subscribe.category=Catégorie
import.google_reader_prefix=Laissez-moi importer vos flux depuis votre compte
import.google_reader_prefix=Laissez-moi importer vos flux depuis votre compte
import.google_reader_suffix=.
import.google_download=Ou alors, téléchargez votre fichier subscriptions.xml.
import.google_download_link=Récuperez-le ici.
@@ -82,7 +82,7 @@ profile.delete_account=Effacer le compte
about.rest_api=API REST
about.keyboard_shortcuts=Raccourcis clavier
about.line1_prefix=CommaFeed est un projet open-source. Les sources sont disponibles sur
about.line1_prefix=CommaFeed est un projet open-source. Les sources sont disponibles sur
about.line1_suffix=.
about.line2_prefix=Si vous rencontrez un problème, rapportez-le sur la page du projet sur
about.line2_suffix=.

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

@@ -44,7 +44,7 @@ public class HTMLConcat {
while (m.find()) {
String var = m.group(1);
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);
return sb.toString();

2
src/main/webapp/templates/_subscribe.html
View File

@@ -58,7 +58,7 @@
<div class="control-group">
<div>${import.google_reader_prefix}
<a href="google/import/redirect">
<img src="images/google_reader_icon.png" class="favicon" />
<img src="images/google_reader_icon.png" class="favicon" />
Google Reader
</a>${import.google_reader_suffix}
</div>

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

@@ -2,10 +2,10 @@
<div class="span6">
<h4><i class="icon-question-sign"></i> ${toolbar.about}</h4>
<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>
${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>
<h4><i class="icon-money"></i> ${toolbar.donate}</h4>