[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model ...

[Christian Bauer]

  User: cbauer  
  Date: 07/10/12 12:31:25

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/model    
                        Comment.java User.java LinkProtocol.java Node.java
  Log:
  Internationalized almost all strings
  
  Revision  Changes    Path
  1.8       +0 -0      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Comment.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  
  
  
  1.11      +14 -5     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: User.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/User.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- User.java	27 Aug 2007 22:22:30 -0000	1.10
  +++ User.java	12 Oct 2007 16:31:25 -0000	1.11
  @@ -31,27 +31,36 @@
       @Column(name = "FIRSTNAME", length = 63, nullable = false)
       @NotNull
       @Length(min = 3, max = 63)
  -    @Pattern(regex="[a-zA-Z]+", message="First name must only contain letters")
  +    @Pattern(
  +        regex="[a-zA-Z]+",
  +        message="#{messages['lacewiki.entity.FirstNameMustOnlyContainLetters']}"
  +    )
       private String firstname;
   
       @Column(name = "LASTNAME", length = 63, nullable = false)
       @NotNull
       @Length(min = 3, max = 63)
  -    @Pattern(regex="[a-zA-Z]+", message="Last name must only contain letters")
  +    @Pattern(
  +        regex="[a-zA-Z]+",
  +        message="#{messages['lacewiki.entity.LastNameMustOnlyContainLetters']}"
  +    )
       private String lastname;
   
       @Column(name = "USERNAME", length = 16, nullable = false, unique = true)
       @NotNull
       @Length(min = 3, max = 16)
  -    @Pattern(regex="[a-zA-Z]?[a-zA-Z0-9]+",
  -          message="Member name must start with a letter, and only contain letters and numbers")
  +    @Pattern(
  +        regex="[a-zA-Z]?[a-zA-Z0-9]+",
  +        message="#{messages['lacewiki.entity.UsernameMustStartWithALetterAndOnlyContainLetters']}"
  +    )
       private String username; // Unique and immutable
   
       @Column(name = "PASSWORDHASH", length = 255, nullable = false)
       private String passwordHash;
   
       @Column(name = "EMAIL", length = 255, nullable = false)
  -    @NotNull @Email
  +    @NotNull
  +    @Email
       private String email;
   
       @Column(name = "ACTIVATED", nullable = false)
  
  
  
  1.4       +4 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LinkProtocol.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/LinkProtocol.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- LinkProtocol.java	17 Aug 2007 13:00:24 -0000	1.3
  +++ LinkProtocol.java	12 Oct 2007 16:31:25 -0000	1.4
  @@ -27,7 +27,10 @@
   
       @Column(name = "PREFIX", nullable = false)
       @Length(min = 2, max = 10)
  -    @org.hibernate.validator.Pattern(regex="[a-zA-Z]+", message="Prefix must only contain letters")
  +    @org.hibernate.validator.Pattern(
  +        regex="[a-zA-Z]+",
  +        message="#{messages['lacewiki.entity.LinkProtokol.PrefixMustOnlyContainLetters']}"
  +    )
       private String prefix;
   
       @Column(name = "LINK", nullable = false)
  
  
  
  1.26      +8 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Node.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Node.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/model/Node.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- Node.java	1 Oct 2007 19:08:05 -0000	1.25
  +++ Node.java	12 Oct 2007 16:31:25 -0000	1.26
  @@ -62,13 +62,19 @@
   
       @Column(name = "NAME", length = 255, nullable = false)
       @Length(min = 3, max = 255)
  -    @Pattern(regex="^[a-zA-Z0-9]+.*", message="Name must start with a letter or number")
  +    @Pattern(
  +        regex="^[a-zA-Z0-9]+.*",
  +        message="#{messages['lacewiki.entity.NameMustStartWithLetterOrNumber']}"
  +    )
       @org.hibernate.search.annotations.Field(index = org.hibernate.search.annotations.Index.TOKENIZED)
       @Searchable(description = "Name")
       protected String name;
   
       @Column(name = "WIKINAME", length = 255, nullable = false)
  -    @Pattern(regex="^[A-Z0-9]+.*", message="Name must start with an uppercase letter or number")
  +    @Pattern(
  +        regex="^[A-Z0-9]+.*",
  +        message="#{messages['lacewiki.entity.NameMustStartWithUppercaseLetterOrNumber']}"
  +    )
       protected String wikiname;
   
       @Column(name = "MENU_ITEM", nullable = false)