X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fgenerate_contributions.py;h=6602f33295fa32a1a38e0a0adf790f83a0fa71da;hb=772aa9cf81b78fd5b83c18bcc588d69c5062bd06;hp=a2e690658362378990e1e6495c173ca691b7d0b5;hpb=07cd297c123dc714a67b1d808cf34f90a4c5bb22;p=lyx.git

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index a2e6906583..6602f33295 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -296,19 +296,31 @@ def main(argv, contributors):
      if len(argv) != 4:
           error(usage(argv[0]))
 
-     txt_credits_data = unicode(as_txt_credits(contributors)).encode("utf-8")
+     if sys.version_info[0] < 3:
+         txt_credits_data = unicode(as_txt_credits(contributors)).encode("utf-8")
+     else:
+         txt_credits_data = str(as_txt_credits(contributors)).encode("utf-8")
      txt_credits = open(argv[1], "w")
      txt_credits.write(txt_credits_data)
 
-     php_credits_data = unicode(as_php_credits(contributors, argv[2])).encode("utf-8")
+     if sys.version_info[0] < 3:
+         php_credits_data = unicode(as_php_credits(contributors, argv[2])).encode("utf-8")
+     else:
+         php_credits_data = str(as_php_credits(contributors, argv[2])).encode("utf-8")
      php_credits = open(argv[2], "w")
      php_credits.write(php_credits_data)
 
-     php_blanket_data = unicode(as_php_blanket(contributors, argv[3])).encode("utf-8")
+     if sys.version_info[0] < 3:
+         php_blanket_data = unicode(as_php_blanket(contributors, argv[3])).encode("utf-8")
+     else:
+         php_blanket_data = str(as_php_blanket(contributors, argv[3])).encode("utf-8")
      php_blanket = open(argv[3], "w")
      php_blanket.write(php_blanket_data)
 
-     warning_data =  unicode(collate_incomplete(contributors) + '\n').encode("utf-8")
+     if sys.version_info[0] < 3:
+         warning_data =  unicode(collate_incomplete(contributors) + '\n').encode("utf-8")
+     else:
+         warning_data =  str(collate_incomplete(contributors) + '\n').encode("utf-8")
      sys.stderr.write(warning_data)
 
 
@@ -771,6 +783,14 @@ contributors = [
                  "28 February 2005",
                  u"Improvements to lyxserver"),
 
+     contributor(u"Shankar Giri Venkita Giri",
+                 "girivs () gmx ! com",
+                 "GPL",
+                 "Blanket permission",
+                 "m=146162343015182",
+                 "25 April 2016",
+                 u"Mingw-w64 build fixes"),
+
      contributor(u"Hartmut Goebel",
                  "h.goebel () crazy-compilers ! com",
                  "GPL",
@@ -883,6 +903,14 @@ contributors = [
                  "6 October 2013",
                  u"Dialog usability fix"),
 
+     contributor(u"John Hudson",
+                 "j.r.hudson () virginmedia ! com",
+                 "GPL",
+                 "Contributions",
+                 "m=146722333213915",
+                 "29 June 2016",
+                 u"Documentation updates"),
+
      contributor(u"Bernard Hurley",
                  "bernard () fong-hurley ! org ! uk",
                  "GPL",
@@ -1251,8 +1279,8 @@ contributors = [
                  "20 October 2014",
                  u"New lfun server-get-statistics"),
 
-     contributor(u"Guillaume Munch>",
-                 "gadmm () free ! fr",
+     contributor(u"Guillaume Munch",
+                 "gm () lyx ! org",
                  "GPL",
                  "Re: -std=c++11 and [PATCH] Improve the display of the source (bugs #6501,#7359)",
                  "m=143890980923229",
@@ -1458,7 +1486,7 @@ contributors = [
                  "m=110905169512662",
                  "21 February 2005",
                  u"GUI-I architect, LyX PR head, LDN, bug reports/fixes, Itemize Bullet Selection, xforms-0.81 + gcc-2.6.3 compatibility"),
-     
+
      contributor(u"Manoj Rajagopalan",
                  "rmanoj () umich ! edu", 
                  "GPL", 
@@ -1466,7 +1494,15 @@ contributors = [
                  "m=123506398801004", 
                  "Feb 19 2009", 
                  u"reference dialog tweaks"),
-     
+
+     contributor(u"Daniel Ramöller",
+                 "d.lyx () web ! de", 
+                 "GPL", 
+                 "Permission", 
+                 "m=147578627921242", 
+                 "Oct 6 2016", 
+                 u"UI improvements"),
+
      contributor(u"Vincent van Ravesteijn",
                  "V.F.vanRavesteijn () tudelft ! nl",
                  "GPL",
@@ -1571,6 +1607,14 @@ contributors = [
                  "25 September 2007",
                  u"Major rework of the AMS classes"),
 
+     contributor(u"Dima Ruinskiy",
+                 "dima.ruinskiy () outlook ! com",
+                 "GPL",
+                 "Joining LyX development team",
+                 "m=146687842921797",
+                 "24 June 2016",
+                 u"Reintroduction of Windows Vista support (bug 10186)"),
+
      contributor(u"Guy Rutenberg",
                  "guyrutenberg () gmail ! com",
                  "GPL",