packages: redmine/redmine-gantt.patch, redmine/redmine-maildomain.patch, re...

baggins baggins at pld-linux.org
Thu Dec 2 14:20:19 CET 2010


Author: baggins                      Date: Thu Dec  2 13:20:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.0.4, builds but completely untested
- 0.9.6 is on REDMINE_0_9 branch
- updated patches
- removed ldap patch, there is net-ldap for ruby 1.9 now

---- Files affected:
packages/redmine:
   redmine-gantt.patch (1.1 -> 1.2) , redmine-maildomain.patch (1.2 -> 1.3) , redmine-mercurial.patch (1.1 -> 1.2) , redmine-pld.patch (1.3 -> 1.4) , redmine-utf-regex.patch (1.4 -> 1.5) , redmine.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/redmine/redmine-gantt.patch
diff -u packages/redmine/redmine-gantt.patch:1.1 packages/redmine/redmine-gantt.patch:1.2
--- packages/redmine/redmine-gantt.patch:1.1	Sat Mar 13 18:56:34 2010
+++ packages/redmine/redmine-gantt.patch	Thu Dec  2 14:20:14 2010
@@ -1,5 +1,5 @@
---- redmine/app/views/issues/gantt.rhtml~	2010-03-13 18:47:18.559124715 +0100
-+++ redmine/app/views/issues/gantt.rhtml	2010-03-13 18:47:21.031124401 +0100
+--- redmine/app/views/gantts/show.html.erb~	2010-03-13 18:47:18.559124715 +0100
++++ redmine/app/views/gantts/show.html.erb	2010-03-13 18:47:21.031124401 +0100
 @@ -62,7 +62,7 @@
      end
  end

================================================================
Index: packages/redmine/redmine-maildomain.patch
diff -u packages/redmine/redmine-maildomain.patch:1.2 packages/redmine/redmine-maildomain.patch:1.3
--- packages/redmine/redmine-maildomain.patch:1.2	Mon Jun 21 14:23:13 2010
+++ packages/redmine/redmine-maildomain.patch	Thu Dec  2 14:20:14 2010
@@ -9,16 +9,7 @@
    validates_numericality_of :port, :only_integer => true
    
    before_validation :strip_ldap_attributes
-@@ -50,7 +51,7 @@
-       dn = entry.dn
-       attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
-                :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
--               :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
-+               :mail => get_mail(entry, login),
-                :auth_source_id => self.id ] if onthefly_register?
-     end
-     return nil if dn.empty?
-@@ -84,7 +85,7 @@
+@@ -63,7 +64,7 @@
    private
    
    def strip_ldap_attributes
@@ -27,8 +18,32 @@
        write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil?
      end
    end
-@@ -110,4 +111,12 @@
-       val
+@@ -77,12 +78,12 @@
+     Net::LDAP.new options
+   end
+ 
+-  def get_user_attributes_from_ldap_entry(entry)
++  def get_user_attributes_from_ldap_entry(entry, login)
+     {
+      :dn => entry.dn,
+      :firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
+      :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
+-     :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
++     :mail => get_mail(entry, login),
+      :auth_source_id => self.id
+     }
+   end
+@@ -116,7 +117,7 @@
+                      :attributes=> search_attributes) do |entry|
+ 
+       if onthefly_register?
+-        attrs = get_user_attributes_from_ldap_entry(entry)
++        attrs = get_user_attributes_from_ldap_entry(entry, login)
+       else
+         attrs = {:dn => entry.dn}
+       end
+@@ -132,4 +133,12 @@
+       entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
      end
    end
 +
@@ -40,9 +55,9 @@
 +    addr
 +  end
  end
-diff -ur redmine-0.9.3-mdomain/app/views/auth_sources/_form.rhtml /usr/share/redmine//app/views/auth_sources/_form.rhtml
---- redmine-0.9.3-mdomain/app/views/auth_sources/_form.rhtml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//app/views/auth_sources/_form.rhtml	2010-03-09 16:09:10.526247745 +0100
+diff -ur redmine-0.9.3-mdomain/app/views/auth_sources/_form.html.erb /usr/share/redmine//app/views/auth_sources/_form.html.erb
+--- redmine-0.9.3-mdomain/app/views/auth_sources/_form.html.erb	2010-03-09 16:10:27.000000000 +0100
++++ /usr/share/redmine//app/views/auth_sources/_form.html.erb	2010-03-09 16:09:10.526247745 +0100
 @@ -25,6 +25,9 @@
  
  <p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
@@ -53,305 +68,6 @@
  </div>
  
  <fieldset class="box"><legend><%=l(:label_attribute_plural)%></legend>
-diff -ur redmine-0.9.3-mdomain/config/locales/bg.yml /usr/share/redmine//config/locales/bg.yml
---- redmine-0.9.3-mdomain/config/locales/bg.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/bg.yml	2010-03-09 16:07:57.704124071 +0100
-@@ -881,3 +881,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/bs.yml /usr/share/redmine//config/locales/bs.yml
---- redmine-0.9.3-mdomain/config/locales/bs.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/bs.yml	2010-03-09 16:02:07.471128387 +0100
-@@ -905,3 +905,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/ca.yml /usr/share/redmine//config/locales/ca.yml
---- redmine-0.9.3-mdomain/config/locales/ca.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/ca.yml	2010-03-09 16:02:07.476311454 +0100
-@@ -884,3 +884,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/cs.yml /usr/share/redmine//config/locales/cs.yml
---- redmine-0.9.3-mdomain/config/locales/cs.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/cs.yml	2010-03-09 16:02:07.481310910 +0100
-@@ -887,3 +887,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/da.yml /usr/share/redmine//config/locales/da.yml
---- redmine-0.9.3-mdomain/config/locales/da.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/da.yml	2010-03-09 16:02:07.486310868 +0100
-@@ -907,3 +907,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/de.yml /usr/share/redmine//config/locales/de.yml
---- redmine-0.9.3-mdomain/config/locales/de.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/de.yml	2010-03-09 16:02:07.491160025 +0100
-@@ -907,3 +907,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/el.yml /usr/share/redmine//config/locales/el.yml
---- redmine-0.9.3-mdomain/config/locales/el.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/el.yml	2010-03-09 16:02:07.496310820 +0100
-@@ -887,3 +887,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/en.yml /usr/share/redmine//config/locales/en.yml
---- redmine-0.9.3-mdomain/config/locales/en.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/en.yml	2010-03-09 16:06:27.213186406 +0100
-@@ -245,6 +245,7 @@
-   field_attr_firstname: Firstname attribute
-   field_attr_lastname: Lastname attribute
-   field_attr_mail: Email attribute
-+  field_maildomain: Email domain
-   field_onthefly: On-the-fly user creation
-   field_start_date: Start
-   field_done_ratio: % Done
-diff -ur redmine-0.9.3-mdomain/config/locales/es.yml /usr/share/redmine//config/locales/es.yml
---- redmine-0.9.3-mdomain/config/locales/es.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/es.yml	2010-03-09 16:02:07.514310788 +0100
-@@ -931,3 +931,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/fi.yml /usr/share/redmine//config/locales/fi.yml
---- redmine-0.9.3-mdomain/config/locales/fi.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/fi.yml	2010-03-09 16:02:07.519310791 +0100
-@@ -917,3 +917,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/fr.yml /usr/share/redmine//config/locales/fr.yml
---- redmine-0.9.3-mdomain/config/locales/fr.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/fr.yml	2010-03-09 16:02:07.524310839 +0100
-@@ -908,3 +908,4 @@
-   enumeration_system_activity: Activité système
-   label_board_sticky: Sticky
-   label_board_locked: Verrouillé
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/gl.yml /usr/share/redmine//config/locales/gl.yml
---- redmine-0.9.3-mdomain/config/locales/gl.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/gl.yml	2010-03-09 16:02:07.529310634 +0100
-@@ -907,3 +907,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/he.yml /usr/share/redmine//config/locales/he.yml
---- redmine-0.9.3-mdomain/config/locales/he.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/he.yml	2010-03-09 16:02:07.534311163 +0100
-@@ -891,3 +891,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/hr.yml /usr/share/redmine//config/locales/hr.yml
---- redmine-0.9.3-mdomain/config/locales/hr.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/hr.yml	2010-03-09 16:02:07.539310860 +0100
-@@ -894,3 +894,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/hu.yml /usr/share/redmine//config/locales/hu.yml
---- redmine-0.9.3-mdomain/config/locales/hu.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/hu.yml	2010-03-09 16:02:07.557311363 +0100
-@@ -912,3 +912,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/id.yml /usr/share/redmine//config/locales/id.yml
---- redmine-0.9.3-mdomain/config/locales/id.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/id.yml	2010-03-09 16:02:07.562253468 +0100
-@@ -899,3 +899,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/it.yml /usr/share/redmine//config/locales/it.yml
---- redmine-0.9.3-mdomain/config/locales/it.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/it.yml	2010-03-09 16:07:57.709123710 +0100
-@@ -894,3 +894,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/ja.yml /usr/share/redmine//config/locales/ja.yml
---- redmine-0.9.3-mdomain/config/locales/ja.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/ja.yml	2010-03-09 16:02:07.572128759 +0100
-@@ -916,3 +916,4 @@
-   enumeration_system_activity: システム作業分類
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/ko.yml /usr/share/redmine//config/locales/ko.yml
---- redmine-0.9.3-mdomain/config/locales/ko.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/ko.yml	2010-03-09 16:02:07.578311147 +0100
-@@ -947,3 +947,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/lt.yml /usr/share/redmine//config/locales/lt.yml
---- redmine-0.9.3-mdomain/config/locales/lt.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/lt.yml	2010-03-09 16:02:07.583311844 +0100
-@@ -955,3 +955,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/nl.yml /usr/share/redmine//config/locales/nl.yml
---- redmine-0.9.3-mdomain/config/locales/nl.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/nl.yml	2010-03-09 16:02:07.601311031 +0100
-@@ -869,3 +869,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/no.yml /usr/share/redmine//config/locales/no.yml
---- redmine-0.9.3-mdomain/config/locales/no.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/no.yml	2010-03-09 16:02:07.606310974 +0100
-@@ -882,3 +882,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/pl.yml /usr/share/redmine//config/locales/pl.yml
---- redmine-0.9.3-mdomain/config/locales/pl.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/pl.yml	2010-03-09 16:02:07.611310884 +0100
-@@ -912,3 +912,4 @@
-   permission_manage_project_activities: Zarządzanie aktywnościami projektu
-   setting_cache_formatted_text: Cache formatted text
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/pt-BR.yml /usr/share/redmine//config/locales/pt-BR.yml
---- redmine-0.9.3-mdomain/config/locales/pt-BR.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/pt-BR.yml	2010-03-09 16:02:07.616310857 +0100
-@@ -915,3 +915,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/pt.yml /usr/share/redmine//config/locales/pt.yml
---- redmine-0.9.3-mdomain/config/locales/pt.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/pt.yml	2010-03-09 16:02:07.621129112 +0100
-@@ -899,3 +899,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/ro.yml /usr/share/redmine//config/locales/ro.yml
---- redmine-0.9.3-mdomain/config/locales/ro.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/ro.yml	2010-03-09 16:02:07.626310893 +0100
-@@ -884,3 +884,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/ru.yml /usr/share/redmine//config/locales/ru.yml
---- redmine-0.9.3-mdomain/config/locales/ru.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/ru.yml	2010-03-09 16:02:07.645310934 +0100
-@@ -995,3 +995,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/sk.yml /usr/share/redmine//config/locales/sk.yml
---- redmine-0.9.3-mdomain/config/locales/sk.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/sk.yml	2010-03-09 16:02:07.650310925 +0100
-@@ -886,3 +886,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/sl.yml /usr/share/redmine//config/locales/sl.yml
---- redmine-0.9.3-mdomain/config/locales/sl.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/sl.yml	2010-03-09 16:02:07.655310814 +0100
-@@ -883,3 +883,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/sr.yml /usr/share/redmine//config/locales/sr.yml
---- redmine-0.9.3-mdomain/config/locales/sr.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/sr.yml	2010-03-09 16:02:07.660310846 +0100
-@@ -902,3 +902,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/sv.yml /usr/share/redmine//config/locales/sv.yml
---- redmine-0.9.3-mdomain/config/locales/sv.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/sv.yml	2010-03-09 16:02:07.665310949 +0100
-@@ -936,3 +936,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/th.yml /usr/share/redmine//config/locales/th.yml
---- redmine-0.9.3-mdomain/config/locales/th.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/th.yml	2010-03-09 16:02:07.670310948 +0100
-@@ -884,3 +884,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/tr.yml /usr/share/redmine//config/locales/tr.yml
---- redmine-0.9.3-mdomain/config/locales/tr.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/tr.yml	2010-03-09 16:02:07.689129224 +0100
-@@ -914,3 +914,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/uk.yml /usr/share/redmine//config/locales/uk.yml
---- redmine-0.9.3-mdomain/config/locales/uk.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/uk.yml	2010-03-09 16:02:07.694310993 +0100
-@@ -883,3 +883,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/vi.yml /usr/share/redmine//config/locales/vi.yml
---- redmine-0.9.3-mdomain/config/locales/vi.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/vi.yml	2010-03-09 16:02:07.699310881 +0100
-@@ -946,3 +946,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/zh-TW.yml /usr/share/redmine//config/locales/zh-TW.yml
---- redmine-0.9.3-mdomain/config/locales/zh-TW.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/zh-TW.yml	2010-03-09 16:02:07.704242744 +0100
-@@ -978,3 +978,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
-diff -ur redmine-0.9.3-mdomain/config/locales/zh.yml /usr/share/redmine//config/locales/zh.yml
---- redmine-0.9.3-mdomain/config/locales/zh.yml	2010-03-09 16:10:27.000000000 +0100
-+++ /usr/share/redmine//config/locales/zh.yml	2010-03-09 16:07:57.727123459 +0100
-@@ -909,3 +909,4 @@
-   setting_cache_formatted_text: Cache formatted text
-   permission_manage_project_activities: Manage project activities
-   label_project_copy_notifications: Send email notifications during the project copy
-+  field_maildomain: Email domain
 diff -ur redmine-0.9.3-mdomain/db/migrate/001_setup.rb /usr/share/redmine//db/migrate/001_setup.rb
 --- redmine-0.9.3-mdomain/db/migrate/001_setup.rb	2010-03-09 16:10:27.000000000 +0100
 +++ /usr/share/redmine//db/migrate/001_setup.rb	2010-03-09 15:58:39.840124128 +0100
@@ -363,3 +79,347 @@
        t.column "onthefly_register", :boolean, :default => false, :null => false
      end
      
+diff -ur redmine-1.0.4-mdomain/config/locales/bg.yml redmine-1.0.4/config/locales/bg.yml
+--- redmine-1.0.4-mdomain/config/locales/bg.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/bg.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -923,3 +923,4 @@
+   label_user_search: "Търсене на потребител:"
+   field_visible: Видим
+   setting_emails_header: Emails header
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/bs.yml redmine-1.0.4/config/locales/bs.yml
+--- redmine-1.0.4-mdomain/config/locales/bs.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/bs.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -935,3 +935,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/ca.yml redmine-1.0.4/config/locales/ca.yml
+--- redmine-1.0.4-mdomain/config/locales/ca.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/ca.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -923,3 +923,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/cs.yml redmine-1.0.4/config/locales/cs.yml
+--- redmine-1.0.4-mdomain/config/locales/cs.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/cs.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -920,3 +920,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/da.yml redmine-1.0.4/config/locales/da.yml
+--- redmine-1.0.4-mdomain/config/locales/da.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/da.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -937,3 +937,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/de.yml redmine-1.0.4/config/locales/de.yml
+--- redmine-1.0.4-mdomain/config/locales/de.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/de.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -945,3 +945,4 @@
+ 
+   field_start_date: Start date
+   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/el.yml redmine-1.0.4/config/locales/el.yml
+--- redmine-1.0.4-mdomain/config/locales/el.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/el.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -921,3 +921,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/en-GB.yml redmine-1.0.4/config/locales/en-GB.yml
+--- redmine-1.0.4-mdomain/config/locales/en-GB.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/en-GB.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -925,3 +925,4 @@
+   notice_not_authorized_archived_project: The project you're trying to access has been archived.
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/en.yml redmine-1.0.4/config/locales/en.yml
+--- redmine-1.0.4-mdomain/config/locales/en.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/en.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -920,3 +920,4 @@
+   enumeration_activities: Activities (time tracking)
+   enumeration_system_activity: System Activity
+ 
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/es.yml redmine-1.0.4/config/locales/es.yml
+--- redmine-1.0.4-mdomain/config/locales/es.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/es.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -967,3 +967,4 @@
+   label_user_search: "Buscar por usuario:"
+   field_visible: Visible
+   setting_emails_header: Encabezado de Correos
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/eu.yml redmine-1.0.4/config/locales/eu.yml
+--- redmine-1.0.4-mdomain/config/locales/eu.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/eu.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -924,3 +924,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/fi.yml redmine-1.0.4/config/locales/fi.yml
+--- redmine-1.0.4-mdomain/config/locales/fi.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/fi.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -945,3 +945,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/fr.yml redmine-1.0.4/config/locales/fr.yml
+--- redmine-1.0.4-mdomain/config/locales/fr.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/fr.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -946,3 +946,4 @@
+   field_assigned_to_role: Rôle de l'assigné
+ 
+   field_start_date: Start date
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/gl.yml redmine-1.0.4/config/locales/gl.yml
+--- redmine-1.0.4-mdomain/config/locales/gl.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/gl.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -937,3 +937,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/he.yml redmine-1.0.4/config/locales/he.yml
+--- redmine-1.0.4-mdomain/config/locales/he.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/he.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -933,3 +933,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/hr.yml redmine-1.0.4/config/locales/hr.yml
+--- redmine-1.0.4-mdomain/config/locales/hr.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/hr.yml	2010-12-02 14:15:06.415818373 +0100
+@@ -927,3 +927,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/hu.yml redmine-1.0.4/config/locales/hu.yml
+--- redmine-1.0.4-mdomain/config/locales/hu.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/hu.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -943,3 +943,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/id.yml redmine-1.0.4/config/locales/id.yml
+--- redmine-1.0.4-mdomain/config/locales/id.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/id.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -928,3 +928,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/it.yml redmine-1.0.4/config/locales/it.yml
+--- redmine-1.0.4-mdomain/config/locales/it.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/it.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -924,3 +924,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/ja.yml redmine-1.0.4/config/locales/ja.yml
+--- redmine-1.0.4-mdomain/config/locales/ja.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/ja.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -955,3 +955,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/ko.yml redmine-1.0.4/config/locales/ko.yml
+--- redmine-1.0.4-mdomain/config/locales/ko.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/ko.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -976,3 +976,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/lt.yml redmine-1.0.4/config/locales/lt.yml
+--- redmine-1.0.4-mdomain/config/locales/lt.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/lt.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -984,3 +984,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/lv.yml redmine-1.0.4/config/locales/lv.yml
+--- redmine-1.0.4-mdomain/config/locales/lv.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/lv.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -915,3 +915,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/mk.yml redmine-1.0.4/config/locales/mk.yml
+--- redmine-1.0.4-mdomain/config/locales/mk.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/mk.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -920,3 +920,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/mn.yml redmine-1.0.4/config/locales/mn.yml
+--- redmine-1.0.4-mdomain/config/locales/mn.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/mn.yml	2010-12-02 14:15:06.416818373 +0100
+@@ -921,3 +921,4 @@
+   field_start_date: Start date
+   label_principal_search: "Search for user or group:"
+   label_user_search: "Search for user:"
++  field_maildomain: Email domain
+diff -ur redmine-1.0.4-mdomain/config/locales/nl.yml redmine-1.0.4/config/locales/nl.yml
+--- redmine-1.0.4-mdomain/config/locales/nl.yml	2010-12-02 14:14:26.000000000 +0100
++++ redmine-1.0.4/config/locales/nl.yml	2010-12-02 14:15:06.416818373 +0100
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine-gantt.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine-maildomain.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine-mercurial.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine-pld.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine-utf-regex.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine.spec?r1=1.33&r2=1.34&f=u



More information about the pld-cvs-commit mailing list