Skip to content

Commit edd1e67

Browse files
flaixflaix
committed
Merge branch pr1343 into master
Merge the edited PR #1343 from @vhot2076. This merge only includes the russian translation. I could not reproduce the layout error, so a new PR with more information should be created if the problem still exists. This merge closes #1343
2 parents 977e724 + ce58fac commit edd1e67

File tree

6 files changed

+867
-0
lines changed

6 files changed

+867
-0
lines changed

‎src/main/java/com/gitblit/wicket/GitBlitWebApp_ru.properties

Lines changed: 790 additions & 0 deletions
Large diffs are not rendered by default.

‎src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ru.html

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml"
3+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"
4+
xml:lang="ru"
5+
lang="ru">
6+
7+
<body>
8+
<wicket:extend>
9+
<div class="container">
10+
<div class="markdown">
11+
<div class="row">
12+
<div class="span10 offset1">
13+
<h3><center>Пустой репозиторий</center></h3>
14+
<div class="alert alert-info">
15+
<span wicket:id="repository" style="font-weight: bold;">[repository]</span> является пустым хранилищем и не может быть просмотрен Gitblit.
16+
<p></p>
17+
Пожалуйста, отправьте (push) некоторые коммиты <span wicket:id="pushurl"></span>
18+
<hr/>
19+
После того, как вы отправили коммиты, вы можете обновить эту страницу, чтобы просмотреть свой репозиторий.
20+
</div>
21+
22+
<h3><center>Создать новый репозиторий в командной строке</center></h3>
23+
24+
<pre wicket:id="createSyntax"></pre>
25+
26+
<h3><center>Отправить существующий репозиторий из командной строки</center></h3>
27+
28+
<pre wicket:id="existingSyntax"></pre>
29+
30+
<div class="span8 offset1">
31+
<h2><center>Учиться Git</center></h2>
32+
<p>Если вы не знаете, как использовать эту информацию, рассмотрите <a href="http://book.git-scm.com">Git Community Book</a> чтобы лучше понять, как использовать Git.</p>
33+
34+
<h4>Git-клиенты с открытым исходным кодом</h4>
35+
<table>
36+
<tbody>
37+
<tr><td><a href="http://git-scm.com">Git</a></td><td>the official, command-line Git</td></tr>
38+
<tr><td><a href="http://tortoisegit.googlecode.com">TortoiseGit</a></td><td>Windows file explorer integration (requires official, command-line Git)</td></tr>
39+
<tr><td><a href="http://eclipse.org/egit">Eclipse/EGit</a></td><td>Git for the Eclipse IDE (based on JGit, like Gitblit)</td></tr>
40+
<tr><td><a href="https://code.google.com/p/gitextensions/">Git Extensions</a></td><td>C# frontend for Git that features Windows Explorer and Visual Studio integration</td></tr>
41+
<tr><td><a href="http://rowanj.github.io/gitx/">GitX-dev</a></td><td>a Mac OS X Git client</td></tr>
42+
</tbody>
43+
</table>
44+
45+
<h4>Commercial/Closed-Source Git Clients</h4>
46+
<table>
47+
<tbody>
48+
<tr><td><a href="http://www.syntevo.com/smartgithg">SmartGit/Hg</a></td><td>A Java Git and Mercurial client for Windows, Mac, and Linux</td></tr>
49+
<tr><td><a href="http://www.sourcetreeapp.com/">SourceTree</a></td><td>A free Git and Mercurial client for Windows & Mac</td></tr>
50+
<tr><td><a href="http://www.git-tower.com/">Tower</a></td><td>a Mac OS X Git client</td></tr>
51+
</tbody>
52+
</table>
53+
</div>
54+
</div>
55+
</div>
56+
</div>
57+
</div>
58+
</wicket:extend>
59+
</body>
60+
</html>

‎src/main/java/com/gitblit/wicket/pages/UserPage.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ static List<Language> getLanguages(){
180180
new Language("Norsk", "no"),
181181
new Language("Język Polski", "pl"),
182182
new Language("Português", "pt_BR"),
183+
new Language("Русский","ru"),
183184
new Language("簡體中文", "zh_CN"),
184185
new Language("正體中文", "zh_TW"));
185186
}

‎src/main/java/login_ru.mkd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Please Login
2+
3+
Пожалуйста, введите свои учетные данные для доступа к этому сайту Gitblit.

‎src/main/java/welcome_ru.mkd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Welcome to Gitblit
2+
3+
Быстрый и простой способ разместить или просмотреть свой собственный [Git](http://www.git-scm.com)-репозиторий.

‎src/test/java/com/gitblit/wicket/GitBlitWebAppResourceBundleTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,16 @@ public void testPtBrResource() throws Exception
126126
assertEquals("Português", bundle.getString("gb.loadLang"));
127127
}
128128

129+
130+
@Test
131+
public void testRuResource() throws Exception
132+
{
133+
Locale l = Locale.forLanguageTag("ru");
134+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
135+
assertNotNull(bundle);
136+
assertEquals("Русский", bundle.getString("gb.loadLang"));
137+
}
138+
129139
@Test
130140
public void testZhCnResource() throws Exception
131141
{

0 commit comments

Comments
 (0)