Commit 1165bae9e8e07b71b7293e2c3152764b19771682:
tweak sort
Branch: refs/heads/master
Author: Sam Ruby <[email protected]>
Committer: Sam Ruby <[email protected]>
Pusher: rubys <[email protected]>
------------------------------------------------------------
lib/whimsy/asf/person.rb | +++ -
www/secretary/workbench/file.cgi | ++ ------
------------------------------------------------------------
12 changes: 5 additions, 7 deletions.
------------------------------------------------------------
diff --git a/lib/whimsy/asf/person.rb b/lib/whimsy/asf/person.rb
index 000ca2f..c43738a 100644
--- a/lib/whimsy/asf/person.rb
+++ b/lib/whimsy/asf/person.rb
@@ -19,6 +19,8 @@ def self.asciize(name)
name.gsub! /\u00fc|u\u0308/, 'ue'
# latin 1
+ name.gsub! /\u00c9/, 'e'
+ name.gsub! /\u00d3/, 'o'
name.gsub! /[\u00e0-\u00e5]/, 'a'
name.gsub! /\u00e7/, 'c'
name.gsub! /[\u00e8-\u00eb]/, 'e'
@@ -72,7 +74,7 @@ def self.sortable_name(name)
name.last.sub! /^IJ/, 'Ij'
name.unshift(suffix) if suffix
name.map! {|word| asciize(word)}
- name.reverse.join(' ')
+ name.reverse.join(' ').downcase
end
def sortable_name
diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index 0edb901..f6bc380 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -645,14 +645,10 @@ _html do
" Avail ID: #{@mavailid}"
].compact.join("\n") + "\n"
- sorted = members.sort_by do |member|
- ASF::ICLA.lname(member.split("\n").first)
- end
-
- members_txt[pattern,1] = " *) " + sorted.join("\n *) ")
+ members_txt[pattern,1] = " *) " + members.join("\n *) ")
members_txt[/We now number (\d+) active members\./,1] =
members.length.to_s
- open("#{FOUNDATION}/members.txt",'w') {|fh| fh.write(members_txt)}
+ File.write("#{FOUNDATION}/members.txt", ASF::Member.sort(members_txt))
_.system "svn diff #{FOUNDATION}/members.txt"
