From ab78d170650106d1d1113282598b6d8270ef2e76 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Fri, 31 Jan 2014 21:44:51 +0700 Subject: Russian as default --- src/java/Blogs.properties | 16 ----- src/java/Blogs_ru.properties | 16 ----- src/java/Chats.properties | 5 -- src/java/Chats_ru.properties | 5 -- src/java/Global.properties | 34 ---------- src/java/Global_ru.properties | 34 ---------- src/java/Login.properties | 6 -- src/java/Login_ru.properties | 6 -- src/java/Map.properties | 5 -- src/java/Map_ru.properties | 5 -- src/java/NewMessage.properties | 10 --- src/java/NewMessage_ru.properties | 10 --- src/java/Photos.properties | 4 -- src/java/Photos_ru.properties | 4 -- src/java/SignUp.properties | 11 ---- src/java/SignUp_ru.properties | 10 --- src/java/User.properties | 24 ------- src/java/UserThread.properties | 4 -- src/java/UserThread_ru.properties | 4 -- src/java/User_ru.properties | 24 ------- src/java/com/juick/http/www/Discover.java | 14 ++-- src/java/com/juick/http/www/Help.java | 16 ++--- src/java/com/juick/http/www/Home.java | 29 ++++----- src/java/com/juick/http/www/Login.java | 27 ++------ src/java/com/juick/http/www/NewMessage.java | 19 ++---- src/java/com/juick/http/www/PM.java | 32 ++++----- src/java/com/juick/http/www/PageTemplates.java | 90 +++++++++++++++++--------- src/java/com/juick/http/www/Settings.java | 14 ++-- src/java/com/juick/http/www/SignUp.java | 36 ++++------- src/java/com/juick/http/www/User.java | 88 +++++++++++-------------- src/java/com/juick/http/www/UserThread.java | 70 +++++++++----------- 31 files changed, 190 insertions(+), 482 deletions(-) delete mode 100644 src/java/Blogs.properties delete mode 100644 src/java/Blogs_ru.properties delete mode 100644 src/java/Chats.properties delete mode 100644 src/java/Chats_ru.properties delete mode 100644 src/java/Global.properties delete mode 100644 src/java/Global_ru.properties delete mode 100644 src/java/Login.properties delete mode 100644 src/java/Login_ru.properties delete mode 100644 src/java/Map.properties delete mode 100644 src/java/Map_ru.properties delete mode 100644 src/java/NewMessage.properties delete mode 100644 src/java/NewMessage_ru.properties delete mode 100644 src/java/Photos.properties delete mode 100644 src/java/Photos_ru.properties delete mode 100644 src/java/SignUp.properties delete mode 100644 src/java/SignUp_ru.properties delete mode 100644 src/java/User.properties delete mode 100644 src/java/UserThread.properties delete mode 100644 src/java/UserThread_ru.properties delete mode 100644 src/java/User_ru.properties (limited to 'src') diff --git a/src/java/Blogs.properties b/src/java/Blogs.properties deleted file mode 100644 index 6190136b..00000000 --- a/src/java/Blogs.properties +++ /dev/null @@ -1,16 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Last\ messages=Last messages -Lists=Lists -Tags=Tags -Search=Search -My\ feed=My feed -Private=Private -Private\ sent=Sent -Discussions=Discussions -Recommended=Recommended -All\ messages=All messages -Popular=Popular -With\ photos=With photos -LoginToReadMore=Sign in to read more diff --git a/src/java/Blogs_ru.properties b/src/java/Blogs_ru.properties deleted file mode 100644 index afe4b145..00000000 --- a/src/java/Blogs_ru.properties +++ /dev/null @@ -1,16 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Last\ messages=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f -Lists=\u0421\u043f\u0438\u0441\u043a\u0438 -Tags=\u0422\u0435\u0433\u0438 -Search=\u041f\u043e\u0438\u0441\u043a -My\ feed=\u041c\u043e\u044f \u043b\u0435\u043d\u0442\u0430 -Private=\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u044b\u0435 -Private\ sent=\u0418\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0435 -Discussions=\u041e\u0431\u0441\u0443\u0436\u0434\u0435\u043d\u0438\u044f -Recommended=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u043e\u0432\u0430\u043d\u043d\u043e\u0435 -All\ messages=\u0412\u0441\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f -Popular=\u041f\u043e\u043f\u0443\u043b\u044f\u0440\u043d\u044b\u0435 -With\ photos=\u0421 \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u044f\u043c\u0438 -LoginToReadMore=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u0443\u0439\u0442\u0435\u0441\u044c, \u0447\u0442\u043e\u0431\u044b \u0447\u0438\u0442\u0430\u0442\u044c \u0434\u0430\u043b\u044c\u0448\u0435 diff --git a/src/java/Chats.properties b/src/java/Chats.properties deleted file mode 100644 index e5596bac..00000000 --- a/src/java/Chats.properties +++ /dev/null @@ -1,5 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Active\ chats=Active chats -Users\ online=Users online diff --git a/src/java/Chats_ru.properties b/src/java/Chats_ru.properties deleted file mode 100644 index 6f144f69..00000000 --- a/src/java/Chats_ru.properties +++ /dev/null @@ -1,5 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Active\ chats=\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0447\u0430\u0442\u044b -Users\ online=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u043e\u043d\u043b\u0430\u0439\u043d diff --git a/src/java/Global.properties b/src/java/Global.properties deleted file mode 100644 index 51bb6928..00000000 --- a/src/java/Global.properties +++ /dev/null @@ -1,34 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Home=Home -Discover=Discover -Search=Search -Blogs=Blogs -Chats=Chats -Photos=Photos -Map=Map -Post=Post -Blog=Blog -Settings=Settings -Logout=Logout -Login=Login -Contacts=Contacts -Help=Help -Advertising=Advertising -Older=Older -Newer=Newer -(replies)\ by=by -Recommended\ by=Recommended by -Comment=Comment -Add\ a\ comment=Add a comment... -Reply=Reply -Sponsored\ by=Sponsored by -Block\ user=Block user -Send\ private\ message=Send private message -Recommend\ message=Recommend message -in\ reply\ to=in reply to -(Dialog)\ Link\ to\ message=Permanent link to this message -(Dialog)\ Message\ number=Message number -(Dialog)\ Share=Share in social networks -Sponsored=Sponsored diff --git a/src/java/Global_ru.properties b/src/java/Global_ru.properties deleted file mode 100644 index e22ac59e..00000000 --- a/src/java/Global_ru.properties +++ /dev/null @@ -1,34 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Home=\u0414\u043e\u043c\u043e\u0439 -Discover=\u041e\u0431\u0437\u043e\u0440 -Search=\u041f\u043e\u0438\u0441\u043a -Blogs=\u0411\u043b\u043e\u0433\u0438 -Chats=\u0427\u0430\u0442\u044b -Photos=\u0424\u043e\u0442\u043e -Map=\u041a\u0430\u0440\u0442\u0430 -Post=\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u044c -Blog=\u0411\u043b\u043e\u0433 -Settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -Logout=\u0412\u044b\u0439\u0442\u0438 -Login=\u0412\u043e\u0439\u0442\u0438 -Contacts=\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u044b -Help=\u0421\u043f\u0440\u0430\u0432\u043a\u0430 -Advertising=\u0420\u0435\u043a\u043b\u0430\u043c\u0430 -Older=\u0421\u0442\u0430\u0440\u044b\u0435 -Newer=\u041d\u043e\u0432\u044b\u0435 -(replies)\ by=\u043e\u0442 -Recommended\ by=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u043e\u0432\u0430\u043b\u0438 -Comment=\u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c -Add\ a\ comment=\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u044c \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439... -Reply=\u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c -Sponsored\ by=\u041f\u0440\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0435 -Block\ user=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f -Send\ private\ message=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 -Recommend\ message=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u043e\u0432\u0430\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 -in\ reply\ to=\u0432 \u043e\u0442\u0432\u0435\u0442 \u043d\u0430 -(Dialog)\ Link\ to\ message=\u041f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u0430\u044f \u0441\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u044d\u0442\u043e \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 -(Dialog)\ Message\ number=\u041d\u043e\u043c\u0435\u0440 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f -(Dialog)\ Share=\u041f\u043e\u0434\u0435\u043b\u0438\u0442\u044c\u0441\u044f \u0432 \u0441\u043e\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0445 \u0441\u0435\u0442\u044f\u0445 -Sponsored=\u0420\u0435\u043a\u043b\u0430\u043c\u0430 diff --git a/src/java/Login.properties b/src/java/Login.properties deleted file mode 100644 index 3275155e..00000000 --- a/src/java/Login.properties +++ /dev/null @@ -1,6 +0,0 @@ -SignUp=Sign up -VKontakte=VKontakte -XMPPLogin=Send LOGIN to -HaveAccount=Already have an account? -Username=Username -Password=Password diff --git a/src/java/Login_ru.properties b/src/java/Login_ru.properties deleted file mode 100644 index b3acd0c7..00000000 --- a/src/java/Login_ru.properties +++ /dev/null @@ -1,6 +0,0 @@ -SignUp=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f -VKontakte=\u0412\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u0435 -XMPPLogin=\u041e\u0442\u043f\u0440\u0430\u0432\u044c\u0442\u0435 LOGIN \u043d\u0430 -HaveAccount=\u0423\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b? -Username=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f -Password=\u041f\u0430\u0440\u043e\u043b\u044c diff --git a/src/java/Map.properties b/src/java/Map.properties deleted file mode 100644 index 004e4d13..00000000 --- a/src/java/Map.properties +++ /dev/null @@ -1,5 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Messages\ on\ map=Messages on map -Popular\ places=Popular places diff --git a/src/java/Map_ru.properties b/src/java/Map_ru.properties deleted file mode 100644 index 633a1bcc..00000000 --- a/src/java/Map_ru.properties +++ /dev/null @@ -1,5 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Messages\ on\ map=\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043d\u0430 \u043a\u0430\u0440\u0442\u0435 -Popular\ places=\u041f\u043e\u043f\u0443\u043b\u044f\u0440\u043d\u044b\u0435 \u043c\u0435\u0441\u0442\u0430 diff --git a/src/java/NewMessage.properties b/src/java/NewMessage.properties deleted file mode 100644 index 851e3134..00000000 --- a/src/java/NewMessage.properties +++ /dev/null @@ -1,10 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -New\ message=New message -Location=Location -Clear=Clear -Photo=Photo -Post=Post -Tags=Tags -Photo_JPG=(JPG, PNG, up to 10Mb) diff --git a/src/java/NewMessage_ru.properties b/src/java/NewMessage_ru.properties deleted file mode 100644 index f9f9017f..00000000 --- a/src/java/NewMessage_ru.properties +++ /dev/null @@ -1,10 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -New\ message=\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 -Location=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 -Clear=\u0423\u0434\u0430\u043b\u0438\u0442\u044c -Photo=\u0424\u043e\u0442\u043e -Post=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c -Tags=\u0422\u0435\u0433\u0438 -Photo_JPG=(JPG, PNG, \u0434\u043e 10\u041c\u0431) diff --git a/src/java/Photos.properties b/src/java/Photos.properties deleted file mode 100644 index 84624aad..00000000 --- a/src/java/Photos.properties +++ /dev/null @@ -1,4 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Last\ photos\ and\ videos=Last photos and videos diff --git a/src/java/Photos_ru.properties b/src/java/Photos_ru.properties deleted file mode 100644 index 1933c3cf..00000000 --- a/src/java/Photos_ru.properties +++ /dev/null @@ -1,4 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -Last\ photos\ and\ videos=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0444\u043e\u0442\u043e \u0438 \u0432\u0438\u0434\u0435\u043e diff --git a/src/java/SignUp.properties b/src/java/SignUp.properties deleted file mode 100644 index 4bb0a162..00000000 --- a/src/java/SignUp.properties +++ /dev/null @@ -1,11 +0,0 @@ -Unknown\ account=Unknown account -Link\ with\ existing=Link with existing Juick account -Link\ with\ this=Link with this account -Create\ new=Create new Juick account -Username=Username -Username\ restrictions=(2 to 16 latin letters and/or numbers, dash sign) -Password=Password -Password\ restrictions=(6 to 32 symbols) -Language=Your primary language -Languages=English,Russian,French,Persian,Other -Language\ codes=en,ru,fr,fa,__ diff --git a/src/java/SignUp_ru.properties b/src/java/SignUp_ru.properties deleted file mode 100644 index 27776f1f..00000000 --- a/src/java/SignUp_ru.properties +++ /dev/null @@ -1,10 +0,0 @@ -Unknown\ account=\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0430\u043a\u043a\u0430\u0443\u043d\u0442 -Link\ with\ existing=\u0421\u0432\u044f\u0437\u0430\u0442\u044c \u0441 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u043c \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u043e\u043c Juick -Link\ with\ this=\u0421\u0432\u044f\u0437\u0430\u0442\u044c \u0441 \u044d\u0442\u0438\u043c \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u043e\u043c -Create\ new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0430\u043a\u043a\u0430\u0443\u043d\u0442 Juick -Username=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f -Username\ restrictions=(\u041e\u0442 2-\u0445 \u0434\u043e 16-\u0438 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0445 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432 \u0438/\u0438\u043b\u0438 \u0446\u0438\u0444\u0440, \u0434\u0435\u0444\u0438\u0441) -Password=\u041f\u0430\u0440\u043e\u043b\u044c -Password\ restrictions=(\u043e\u0442 6-\u0438 \u0434\u043e 32-\u0445 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432) -Language=\u0412\u0430\u0448 \u0440\u043e\u0434\u043d\u043e\u0439 \u044f\u0437\u044b\u043a -Languages=\u0410\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438\u0439,\u0420\u0443\u0441\u0441\u043a\u0438\u0439,\u0424\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0438\u0439,\u041f\u0435\u0440\u0441\u0438\u0434\u0441\u043a\u0438\u0439,\u0414\u0440\u0443\u0433\u043e\u0439 diff --git a/src/java/User.properties b/src/java/User.properties deleted file mode 100644 index 3ed6bfa7..00000000 --- a/src/java/User.properties +++ /dev/null @@ -1,24 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -(Stats)\ I\ read=I read -(Stats)\ My\ readers=My readers -(Stats)\ Messages=Messages -(Stats)\ Replies=Replies -(Menu)\ Messages=Messages -(Menu)\ Blog=Blog -(Menu)\ Recommendations=Recommendations -(Menu)\ Photos=Photos and videos -(Menu)\ Tags=Tags -(Menu)\ Search=Search -Replies=Replies -Expand\ all=Expand all -View\ as\ list=View as list -View\ as\ tree=View as tree -all=all -Search=Search -(UToolbar)\ Subcribe=Subscribe -(UToolbar)\ Subcribed=Subscribed -(UToolbar)\ Block=Block user -(UToolbar)\ Unblock=Unblock user -(UToolbar)\ Private=Send a private message diff --git a/src/java/UserThread.properties b/src/java/UserThread.properties deleted file mode 100644 index b33f4fe0..00000000 --- a/src/java/UserThread.properties +++ /dev/null @@ -1,4 +0,0 @@ -(MToolbar)\ Subcribe=Subscribe -(MToolbar)\ Subcribed=Subscribed -(MToolbar)\ Recommend=Recommend -(MToolbar)\ Delete=Delete diff --git a/src/java/UserThread_ru.properties b/src/java/UserThread_ru.properties deleted file mode 100644 index 8e5e2632..00000000 --- a/src/java/UserThread_ru.properties +++ /dev/null @@ -1,4 +0,0 @@ -(Toolbar)\ Subcribe=\u041f\u043e\u0434\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f -(Toolbar)\ Subcribed=\u041f\u043e\u0434\u043f\u0438\u0441\u0430\u043d -(Toolbar)\ Recommend=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u043e\u0432\u0430\u0442\u044c -(Toolbar)\ Delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c diff --git a/src/java/User_ru.properties b/src/java/User_ru.properties deleted file mode 100644 index fab91ceb..00000000 --- a/src/java/User_ru.properties +++ /dev/null @@ -1,24 +0,0 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. - -(Stats)\ I\ read=\u042f \u0447\u0438\u0442\u0430\u044e -(Stats)\ My\ readers=\u041c\u0435\u043d\u044f \u0447\u0438\u0442\u0430\u044e\u0442 -(Stats)\ Messages=\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 -(Stats)\ Replies=\u041e\u0442\u0432\u0435\u0442\u043e\u0432 -(Menu)\ Messages=\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f -(Menu)\ Blog=\u0411\u043b\u043e\u0433 -(Menu)\ Recommendations=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0430\u0446\u0438\u0438 -(Menu)\ Photos=\u0424\u043e\u0442\u043e \u0438 \u0432\u0438\u0434\u0435\u043e -(Menu)\ Tags=\u0422\u0435\u0433\u0438 -(Menu)\ Search=\u041f\u043e\u0438\u0441\u043a -Replies=\u041e\u0442\u0432\u0435\u0442\u044b -Expand\ all=\u0420\u0430\u0441\u043a\u0440\u044b\u0442\u044c \u0432\u0441\u0435 -View\ as\ list=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u043f\u0438\u0441\u043a\u043e\u043c -View\ as\ tree=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0434\u0435\u0440\u0435\u0432\u043e\u043c -all=\u0432\u0441\u0435 -Search=\u041f\u043e\u0438\u0441\u043a -(UToolbar)\ Subcribe=\u041f\u043e\u0434\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f -(UToolbar)\ Subcribed=\u041f\u043e\u0434\u043f\u0438\u0441\u0430\u043d -(UToolbar)\ Block=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f -(UToolbar)\ Unblock=\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f -(UToolbar)\ Private=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java index 4fb4c9c0..4e4a6b3d 100644 --- a/src/java/com/juick/http/www/Discover.java +++ b/src/java/com/juick/http/www/Discover.java @@ -25,8 +25,6 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.sql.Connection; import java.util.ArrayList; -import java.util.Locale; -import java.util.ResourceBundle; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -39,8 +37,6 @@ public class Discover { protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { com.juick.User visitor = Utils.getVisitorUser(sql, request, response); - Locale locale = request.getLocale(); - ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale); String requesturi = request.getRequestURI(); @@ -77,15 +73,15 @@ public class Discover { canonical = ""; } PageTemplates.pageHead(out, title, canonical); - PageTemplates.pageNavigation(out, locale, visitor, null); + PageTemplates.pageNavigation(out, visitor, null); - PageTemplates.pageHomeColumn(out, sql, visitor, locale); + PageTemplates.pageHomeColumn(out, sql, visitor); out.println("
"); if (mids.size() > 0) { out.println(""); } @@ -96,8 +92,8 @@ public class Discover { out.println("
"); - PageTemplates.pageFooter(request, out, locale, visitor, true); - PageTemplates.pageDialogTemplate(out, locale); + PageTemplates.pageFooter(request, out, visitor, true); + PageTemplates.pageDialogTemplate(out); PageTemplates.pageEnd(out); } finally { out.close(); diff --git a/src/java/com/juick/http/www/Help.java b/src/java/com/juick/http/www/Help.java index c6a64622..101988bb 100644 --- a/src/java/com/juick/http/www/Help.java +++ b/src/java/com/juick/http/www/Help.java @@ -23,8 +23,6 @@ import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; import java.sql.Connection; -import java.util.Locale; -import java.util.ResourceBundle; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,17 +34,11 @@ import javax.servlet.http.HttpServletResponse; public class Help { protected void doRedirectToHelpIndex(Connection sql, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String lang = request.getLocale().getLanguage(); - if (!(lang.equals("ru") || lang.equals("fr"))) { - lang = "en"; - } - Utils.sendTemporaryRedirect(response, "/help/" + lang + "/"); + Utils.sendTemporaryRedirect(response, "/help/ru/"); } protected void doGetHelp(Connection sql, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { com.juick.User visitor = Utils.getVisitorUser(sql, request, response); - Locale locale = request.getLocale(); - ResourceBundle rb = ResourceBundle.getBundle("Global", locale); String path[] = request.getRequestURI().split("/"); String page; @@ -74,8 +66,8 @@ public class Help { response.setContentType("text/html; charset=UTF-8"); PrintWriter out = response.getWriter(); try { - PageTemplates.pageHead(out, rb.getString("Help"), ""); - PageTemplates.pageNavigation(out, locale, visitor, null); + PageTemplates.pageHead(out, "Помощь", ""); + PageTemplates.pageNavigation(out, visitor, null); out.println("