i18n implementation (#55)

This commit is contained in:
Athou
2013-05-12 12:38:56 +02:00
parent ca47270db1
commit 98aeccbb66
23 changed files with 353 additions and 124 deletions

View File

@@ -26,6 +26,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.crypt.Base64;
import com.commafeed.backend.MetricsBean;
import com.commafeed.backend.StartupBean;
import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedEntryDAO;
@@ -89,6 +90,9 @@ public abstract class AbstractREST {
@Inject
UserService userService;
@Inject
StartupBean startupBean;
@Inject
UserSettingsDAO userSettingsDAO;

View File

@@ -18,6 +18,8 @@ public class ServerREST extends AbstractResourceREST {
ServerInfo infos = new ServerInfo();
infos.setAnnouncement(applicationSettingsService.get()
.getAnnouncement());
infos.getSupportedLanguages().putAll(
startupBean.getSupportedLanguages());
return infos;
}
}

View File

@@ -64,6 +64,10 @@ public class UserREST extends AbstractResourceREST {
public Response saveSettings(@ApiParam Settings settings) {
Preconditions.checkNotNull(settings);
if (startupBean.getSupportedLanguages().get(settings.getLanguage()) == null) {
settings.setLanguage("en");
}
UserSettings s = userSettingsDAO.findByUser(getUser());
if (s == null) {
s = new UserSettings();