projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Shut down downloader thread pool when stopping the core.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
freenet
/
L10nFilter.java
diff --git
a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
index
1cde976
..
36ac8cd
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
+++ b/
src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - L10nFilter.java - Copyright © 2010–201
2
David Roden
+ * Sone - L10nFilter.java - Copyright © 2010–201
3
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-52,7
+52,7
@@
public class L10nFilter implements Filter {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public String format(TemplateContext templateContext, Object data, Map<String,
String
> parameters) {
+ public String format(TemplateContext templateContext, Object data, Map<String,
Object
> parameters) {
if (parameters.isEmpty()) {
return webInterface.getL10n().getString(String.valueOf(data));
}
if (parameters.isEmpty()) {
return webInterface.getL10n().getString(String.valueOf(data));
}
@@
-60,11
+60,6
@@
public class L10nFilter implements Filter {
int parameterIndex = 0;
while (parameters.containsKey(String.valueOf(parameterIndex))) {
Object value = parameters.get(String.valueOf(parameterIndex));
int parameterIndex = 0;
while (parameters.containsKey(String.valueOf(parameterIndex))) {
Object value = parameters.get(String.valueOf(parameterIndex));
- if (((String) value).startsWith("=")) {
- value = ((String) value).substring(1);
- } else {
- value = templateContext.get((String) value);
- }
parameterValues.add(value);
++parameterIndex;
}
parameterValues.add(value);
++parameterIndex;
}