0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #355 from codelibs/10.0.x

Browse source 
Merge from 10.0.x
This commit is contained in:
Shinsuke Sugaya 2016-02-07 17:01:15 +09:00
commit 26d5538318
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java
View file

@ -15,6 +15,9 @@
*/
package org.codelibs.fess.mylasta.direction;
import java.util.List;
import java.util.function.Consumer;
import javax.annotation.Resource;
import org.codelibs.fess.app.web.base.FessAdminAction;
@ -146,7 +149,7 @@ public class FessFwAssistantDirector extends CachedFwAssistantDirector {
direction.directRequest(createUserLocaleProcessProvider(), createUserTimeZoneProcessProvider());
direction.directCookie(createCookieResourceProvider());
direction.directAdjustment(createActionAdjustmentProvider());
direction.directMessage(nameList -> nameList.add("fess_message"), "fess_label");
direction.directMessage(createMessageNameList(), "fess_label");
direction.directApiCall(createApiFailureHook());
direction.directMultipart(() -> new FessMultipartRequestHandler());
direction.directHtmlRendering(new JspHtmlRenderingProvider() {
@ -161,6 +164,10 @@ public class FessFwAssistantDirector extends CachedFwAssistantDirector {
});
}
protected Consumer<List<String>> createMessageNameList() {
return nameList -> nameList.add("fess_message");
}
protected FessUserLocaleProcessProvider createUserLocaleProcessProvider() {
return new FessUserLocaleProcessProvider();
}

2
src/main/resources/fess_label.properties
View file

@ -254,7 +254,7 @@ labels.logout_button=Logout
labels.top.search=Search
labels.index_title=Fess
labels.index_form_search_btn=Search
labels.index_osdd_title=Fess Search
labels.index_osdd_title=Search
labels.index_form_option_btn=Options
labels.index_help=Help
labels.search_options=Search Options

2
src/main/resources/fess_label_en.properties
View file

@ -254,7 +254,7 @@ labels.logout_button=Logout
labels.top.search=Search
labels.index_title=Fess
labels.index_form_search_btn=Search
labels.index_osdd_title=Fess Search
labels.index_osdd_title=Search
labels.index_form_option_btn=Options
labels.index_help=Help
labels.search_options=Search Options

2
src/main/resources/fess_label_ja.properties
View file

@ -248,7 +248,7 @@ labels.logout_button = \u30ed\u30b0\u30a2\u30a6\u30c8
labels.top.search = \u691c\u7d22
labels.index_title = Fess
labels.index_form_search_btn = \u691c\u7d22
labels.index_osdd_title = Fess\u3067\u691c\u7d22
labels.index_osdd_title = \u691c\u7d22
labels.index_form_option_btn = \u30aa\u30d7\u30b7\u30e7\u30f3
labels.index_help = \u30d8\u30eb\u30d7
labels.search_options = \u691c\u7d22\u30aa\u30d7\u30b7\u30e7\u30f3