From 8fa9a684c8a06bed7235f58f79af2d88da13fede Mon Sep 17 00:00:00 2001 From: KillyMXI Date: Sun, 20 Aug 2017 18:15:09 +0300 Subject: www: i18n --- juick-www/src/main/java/com/juick/www/controllers/Home.java | 4 +--- juick-www/src/main/java/com/juick/www/controllers/Tags.java | 3 +-- juick-www/src/main/java/com/juick/www/controllers/User.java | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'juick-www/src/main/java/com') diff --git a/juick-www/src/main/java/com/juick/www/controllers/Home.java b/juick-www/src/main/java/com/juick/www/controllers/Home.java index 7a019af8..bda3d60f 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/Home.java +++ b/juick-www/src/main/java/com/juick/www/controllers/Home.java @@ -184,9 +184,7 @@ public class Home { if (paramSearch != null) { nextpage += "&search=" + URLEncoder.encode(paramSearch, CharEncoding.UTF_8); } - - String next = "

Читать дальше →

"; - model.addAttribute("next", next); + model.addAttribute("nextpage", nextpage); } UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build(); String queryString = builder.getQuery(); diff --git a/juick-www/src/main/java/com/juick/www/controllers/Tags.java b/juick-www/src/main/java/com/juick/www/controllers/Tags.java index eef317a9..4c00ad6a 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/Tags.java +++ b/juick-www/src/main/java/com/juick/www/controllers/Tags.java @@ -105,8 +105,7 @@ public class Tags { model.addAttribute("isModerator", visitor.getUid() == 3694); if (mids.size() >= 20) { String nextpage = "/tag/" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8) + "?before=" + mids.get(mids.size() - 1); - String next = "

Читать дальше →

"; - model.addAttribute("next", next); + model.addAttribute("nextpage", nextpage); } return "views/index"; } diff --git a/juick-www/src/main/java/com/juick/www/controllers/User.java b/juick-www/src/main/java/com/juick/www/controllers/User.java index 0daad082..26eb7cb1 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/User.java +++ b/juick-www/src/main/java/com/juick/www/controllers/User.java @@ -171,13 +171,10 @@ public class User { if (paramSearch != null) { nextpage += "&search=" + URLEncoder.encode(paramSearch, CharEncoding.UTF_8); } - if (paramTag != null) { nextpage += "&tag=" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8); } - - String next = "

Читать дальше →

"; - model.addAttribute("next", next); + model.addAttribute("nextpage", nextpage); } UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build(); String queryString = builder.getQuery(); -- cgit v1.2.3