Merge branch 'rc6'

HCNenseth · May 19, 2015 · bf3b4e0 · bf3b4e0
2 parents 2e7966d + bbaf070
commit bf3b4e0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/languages/lang.eng.xml b/languages/lang.eng.xml
@@ -106,6 +106,7 @@
     <string name="vehicle_registration_error">Invalid date.</string>
     <string name="vehicle_horse_power">Horse power</string>
     <string name="vehicle_horse_power_error">Must contain only numbers</string>
+    <string name="owner_error">Owner contain between 2 and 8 characters</string>
     <string name="view_customer">View customer</string>
 
     <!-- insurance -->

diff --git a/languages/lang.it.xml b/languages/lang.it.xml
@@ -103,6 +103,7 @@
     <string name="vehicle_registration_error">Data non valida</string>
     <string name="vehicle_horse_power">Cavalli di potenza</string>
     <string name="vehicle_horse_power_error">Cavalli di potenza deve contere solo cifre</string>
+    <string name="owner_error">Proprietario deve contenere tra i 2 e gli 20 caratteri</string>
     <string name="view_customer">Mostra cliente</string>
 
     <!-- insurance -->

diff --git a/languages/lang.nor.xml b/languages/lang.nor.xml
@@ -106,6 +106,7 @@
     <string name="vehicle_registration_error">Ugyldig dato</string>
     <string name="vehicle_horse_power">Hestekrefter</string>
     <string name="vehicle_horse_power_error">Hestekrefter kan bare inneholde tall</string>
+    <string name="owner_error">Eier må innehold mellom 2 og 20 tegn</string>
     <string name="view_customer">Vis kunde</string>
 
     <!-- insurance -->

diff --git a/src/main/controller/adapter/insurance/CarAdapter.java b/src/main/controller/adapter/insurance/CarAdapter.java
@@ -65,6 +65,8 @@ private void initNodes()
         owner = new FormValueNode.Builder(Loc.c("owner"))
                 .value(getEditMode() ? getInsurance().getOwner() : "")
                 .regex(StringMatcher.getBaseString())
+                .error(Loc.c("owner_error"))
+                .required(false)
                 .build();
 
         registration = new FormDateNode.Builder(Loc.c("vehicle_registration"),