Skip to content

Commit 4f70148

Browse files
flaixflaix
authored
Merge pull request #1379 from flaix/fix-no-properties
Fix norwegian properties file
2 parents 9a747d0 + 111eaef commit 4f70148

15 files changed

+197
-7
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,3 +785,6 @@ gb.deletePatchsetFailure = Error deleting Patchset {0}.
785785
gb.referencedByCommit = Referenced by commit.
786786
gb.referencedByTicket = Referenced by ticket.
787787
gb.emailClientCertificateSubject = Your Gitblit client certificate for {0}
788+
789+
# This last property for unit tests to test successful loading of the resource file
790+
gb.loadLang = default

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,3 +786,6 @@ gb.mailingLists=e-mailov\u00e1 konference
786786
gb.blinkComparator=Blink kompar\u00e1tor
787787
palette.available=Dostupn\u00ed
788788
palette.selected=Vybran\u00ed
789+
790+
# This last property for unit tests to test successful loading of the resource file
791+
gb.loadLang = \u010de\u0161tina

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,4 +753,7 @@ gb.diffCopiedFile = Datei kopiert von {0}
753753
gb.diffTruncated = Diff nach obiger Datei abgeschnitten
754754
gb.opacityAdjust = Transparenz
755755
gb.blinkComparator = Blinkkomparator
756-
gb.imgdiffSubtract = Pixeldifferenz (schwarz = identisch)
756+
gb.imgdiffSubtract = Pixeldifferenz (schwarz = identisch)
757+
758+
# This last property for unit tests to test successful loading of the resource file
759+
gb.loadLang = Deutsch

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,4 +670,7 @@ gb.repositoryIsFrozen = Este Repositorio est\u00E1 congelado.
670670
gb.repositoryDoesNotAcceptPatchsets = Este Repositorio no acepta parches.
671671
gb.serverDoesNotAcceptPatchsets = Este Servidor-Git no acepta parches.
672672
gb.ticketIsClosed = Este ticket est\u00E1 cerrado.
673-
gb.mergeToDescription = Rama de integraciu00F3n predeterminada para combinar ticket y parches
673+
gb.mergeToDescription = Rama de integraciu00F3n predeterminada para combinar ticket y parches
674+
675+
# This last property for unit tests to test successful loading of the resource file
676+
gb.loadLang = Espa\u00f1ol

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,4 +682,7 @@ gb.diffCopiedFile = Fichier copi\u00e9 de {0}
682682
gb.diffTruncated = Affichage de diff\u00e9rences supprim\u00e9e apr\u00e8s le fichier ci-dessus
683683
gb.opacityAdjust = ajuster l'opacit\u00e9
684684
gb.blinkComparator = Comparateur \u00e0 clignotement
685-
gb.imgdiffSubtract = Diff\u00e9rence (noir = identique)
685+
gb.imgdiffSubtract = Diff\u00e9rence (noir = identique)
686+
687+
# This last property for unit tests to test successful loading of the resource file
688+
gb.loadLang = fran\u00e7ais

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,3 +744,5 @@ gb.sshKeyPermissionDescription = Definisci il il livello di accesso per la chiav
744744
gb.transportPreference = Preferenze di trasporto
745745
gb.transportPreferenceDescription = Specifica il protocollo di trasporto che preferisci usare per le operazioni di clone
746746

747+
# This last property for unit tests to test successful loading of the resource file
748+
gb.loadLang = Italiano

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,4 +449,7 @@ gb.closeBrowser = Please close the browser to properly end the session.
449449
gb.doesNotExistInTree = {0} does not exist in tree {1}
450450
gb.enableIncrementalPushTags = enable incremental push tags
451451
gb.useIncrementalPushTagsDescription = on push, automatically tag each branch tip with an incremental revision number
452-
gb.incrementalPushTagMessage = Auto-tagged [{0}] branch on push
452+
gb.incrementalPushTagMessage = Auto-tagged [{0}] branch on push
453+
454+
# This last property for unit tests to test successful loading of the resource file
455+
gb.loadLang = \u306b\u307b\u3093\u3054

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,3 +784,7 @@ gb.deletePatchsetSuccess = {0} \uD328\uCE58\uC14B\uC774 \uC0AD\uC81C\uB418\uC5C8
784784
gb.deletePatchsetFailure = {0} \uD328\uCE58\uC14B \uC0AD\uC81C \uC624\uB958.
785785
gb.referencedByCommit = \uCEE4\uBC0B\uC5D0 \uCC38\uC870\uB428.
786786
gb.referencedByTicket = \uD2F0\uCF13\uC5D0 \uCC38\uC870\uB428.
787+
788+
# This last property for unit tests to test successful loading of the resource file
789+
gb.loadLang = \ud55c\uad6d\uc5b4
790+

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,3 +743,7 @@ gb.permission = Permissie
743743
gb.sshKeyPermissionDescription = Specificeer de toegangsrechten voor de SSH sleutel
744744
gb.transportPreference = Transportvoorkeuren
745745
gb.transportPreferenceDescription = Stel de transportmethode in die u wenst voor het clonen
746+
747+
# This last property for unit tests to test successful loading of the resource file
748+
gb.loadLang = Nederlands
749+

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ gb.clonePolicyDescription = Alle kan se dette repositoriet. Du bestemmer hvem so
700700
gb.viewPolicy = Begrense View, Clone og Push
701701
gb.viewPolicyDescription = Du bestemmer hvem som kan se, clone og pushe til dette repositoriet.
702702
gb.initialCommit = F\u00F8rste commit
703-
gb.initialCommitDescription = Dette vil la deg kunne <code>git clone</code> repositoriet med en gang. Hopp over dette skrittet hvis du allerede har kj\u0F8rt if <code>git init</code> lokalt.
703+
gb.initialCommitDescription = Dette vil la deg kunne <code>git clone</code> repositoriet med en gang. Hopp over dette skrittet hvis du allerede har kj\u00F8rt if <code>git init</code> lokalt.
704704
gb.initWithReadme = Inkluder en README
705705
gb.initWithReadmeDescription = Dette vil generere en enkel README-fil i ditt repository.
706706
gb.initWithGitignore = Inkluder en .gitignore fil
@@ -742,4 +742,7 @@ gb.sshKeyCommentDescription = Angi en valgfri kommentar. Kommentaren vil bli eks
742742
gb.permission = Tilgang
743743
gb.sshKeyPermissionDescription = Angi tilgangsrettinghet for SSH n\u00F8kkelen
744744
gb.transportPreference = Foretrukket transport
745-
gb.transportPreferenceDescription = Sett transportmetoden du foretrekker for cloning
745+
gb.transportPreferenceDescription = Sett transportmetoden du foretrekker for cloning
746+
747+
# This last property for unit tests to test successful loading of the resource file
748+
gb.loadLang = Norsk

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,3 +503,6 @@ gb.todaysActivityStats = dzisiaj / {1} zmian przez {2} autor\u00F3w
503503
gb.todaysActivityNone = dzisiaj / brak
504504
gb.noActivityToday = brak aktywno\u015Bci w dniu dzisiejszym
505505
gb.anonymousUser= anonimowy
506+
507+
# This last property for unit tests to test successful loading of the resource file
508+
gb.loadLang = polszczyzna

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,4 +502,8 @@ gb.reviewPatchset = rever {0} patchset {1}
502502
gb.todaysActivityStats = hoje / {1} commits por {2} autores
503503
gb.todaysActivityNone = hoje / nenhum
504504
gb.noActivityToday = não houve atividade hoje
505-
gb.anonymousUser= anônimo
505+
gb.anonymousUser= anônimo
506+
507+
# This last property for unit tests to test successful loading of the resource file
508+
gb.loadLang = Portugu\u00eas
509+

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,3 +784,6 @@ gb.deletePatchsetFailure = \u5220\u9664\u8865\u4e01\u96c6 {0} \u65f6\u53d1\u751f
784784
gb.referencedByCommit = \u88ab\u63d0\u4ea4\u5f15\u7528\u3002
785785
gb.referencedByTicket = \u88ab\u4efb\u52a1\u5f15\u7528\u3002
786786
gb.emailClientCertificateSubject = \u7528\u4e8e {0} \u7684 Gitblit \u5ba2\u6237\u7aef\u8bc1\u4e66
787+
788+
# This last property for unit tests to test successful loading of the resource file
789+
gb.loadLang = \u6c49\u5b57

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,3 +783,6 @@ gb.deletePatchsetFailure = \u522a\u9664 Patchset {0} \u932f\u8aa4.
783783
gb.referencedByCommit = Referenced by commit.
784784
gb.referencedByTicket = Referenced by ticket.
785785
gb.emailClientCertificateSubject = \u4F3A\u670D\u5668 {0} \u9023\u7DDA\u6191\u8B49
786+
787+
# This last property for unit tests to test successful loading of the resource file
788+
gb.loadLang = \u6f22\u5b57

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

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
package com.gitblit.wicket;
2+
3+
import org.junit.Test;
4+
5+
import java.util.Locale;
6+
import java.util.ResourceBundle;
7+
8+
import static org.junit.Assert.*;
9+
10+
public class GitBlitWebAppResourceBundleTest
11+
{
12+
@Test
13+
public void testDefaultResource()
14+
{
15+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp");
16+
assertNotNull(bundle);
17+
assertEquals("default", bundle.getString("gb.loadLang"));
18+
}
19+
20+
@Test
21+
public void testCsResource()
22+
{
23+
Locale l = Locale.forLanguageTag("cs");
24+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
25+
assertNotNull(bundle);
26+
assertEquals("čeština", bundle.getString("gb.loadLang"));
27+
}
28+
29+
@Test
30+
public void testDeResource()
31+
{
32+
Locale l = Locale.GERMAN;
33+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
34+
assertNotNull(bundle);
35+
assertEquals("Deutsch", bundle.getString("gb.loadLang"));
36+
}
37+
38+
@Test
39+
public void testEnResource()
40+
{
41+
Locale l = Locale.ENGLISH;
42+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
43+
assertNotNull(bundle);
44+
// The "en" file is just a placeholder for the default one.
45+
assertEquals("default", bundle.getString("gb.loadLang"));
46+
}
47+
48+
@Test
49+
public void testEsResource()
50+
{
51+
Locale l = Locale.forLanguageTag("es");
52+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
53+
assertNotNull(bundle);
54+
assertEquals("Español", bundle.getString("gb.loadLang"));
55+
}
56+
57+
@Test
58+
public void testFrResource() throws Exception
59+
{
60+
Locale l = Locale.FRENCH;
61+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
62+
assertNotNull(bundle);
63+
assertEquals("français", bundle.getString("gb.loadLang"));
64+
}
65+
66+
@Test
67+
public void testItResource() throws Exception
68+
{
69+
Locale l = Locale.ITALIAN;
70+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
71+
assertNotNull(bundle);
72+
assertEquals("Italiano", bundle.getString("gb.loadLang"));
73+
}
74+
75+
@Test
76+
public void testJaResource() throws Exception
77+
{
78+
Locale l = Locale.JAPANESE;
79+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
80+
assertNotNull(bundle);
81+
assertEquals("にほんご", bundle.getString("gb.loadLang"));
82+
}
83+
84+
@Test
85+
public void testKoResource() throws Exception
86+
{
87+
Locale l = Locale.KOREAN;
88+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
89+
assertNotNull(bundle);
90+
assertEquals("한국어", bundle.getString("gb.loadLang"));
91+
}
92+
93+
@Test
94+
public void testNlResource() throws Exception
95+
{
96+
Locale l = Locale.forLanguageTag("nl");
97+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
98+
assertNotNull(bundle);
99+
assertEquals("Nederlands", bundle.getString("gb.loadLang"));
100+
}
101+
102+
@Test
103+
public void testNoResource() throws Exception
104+
{
105+
Locale l = Locale.forLanguageTag("no");
106+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
107+
assertNotNull(bundle);
108+
assertEquals("Norsk", bundle.getString("gb.loadLang"));
109+
}
110+
111+
@Test
112+
public void testPlResource() throws Exception
113+
{
114+
Locale l = Locale.forLanguageTag("pl");
115+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
116+
assertNotNull(bundle);
117+
assertEquals("polszczyzna", bundle.getString("gb.loadLang"));
118+
}
119+
120+
@Test
121+
public void testPtBrResource() throws Exception
122+
{
123+
Locale l = Locale.forLanguageTag("pt-BR");
124+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
125+
assertNotNull(bundle);
126+
assertEquals("Português", bundle.getString("gb.loadLang"));
127+
}
128+
129+
@Test
130+
public void testZhCnResource() throws Exception
131+
{
132+
Locale l = Locale.SIMPLIFIED_CHINESE;
133+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
134+
assertNotNull(bundle);
135+
assertEquals("汉字", bundle.getString("gb.loadLang"));
136+
}
137+
138+
@Test
139+
public void testZhTwResource() throws Exception
140+
{
141+
Locale l = Locale.TRADITIONAL_CHINESE;
142+
ResourceBundle bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", l);
143+
assertNotNull(bundle);
144+
assertEquals("漢字", bundle.getString("gb.loadLang"));
145+
}
146+
}

0 commit comments

Comments
 (0)