launchpad-reviewers team mailing list archive

[Chris Johnston <chris.johnston@xxxxxxxxxxxxx>]

Chris Johnston has proposed merging lp:~chrisjohnston/launchpad/fdl into lp:launchpad.

Commit message:
Changes GFDL to FDL to match the actual license name.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1090542 in Launchpad itself: "GFDL licence is misspelled"
  https://bugs.launchpad.net/launchpad/+bug/1090542

For more details, see:
https://code.launchpad.net/~chrisjohnston/launchpad/fdl/+merge/140216
-- 
https://code.launchpad.net/~chrisjohnston/launchpad/fdl/+merge/140216
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~chrisjohnston/launchpad/fdl into lp:launchpad.

=== modified file 'lib/lp/app/widgets/product.py'
--- lib/lp/app/widgets/product.py	2012-12-11 00:32:46 +0000
+++ lib/lp/app/widgets/product.py	2012-12-17 14:57:50 +0000
@@ -289,7 +289,7 @@
         'COMMON_PUBLIC': 'more',
         'ECLIPSE': 'more',
         'EDUCATIONAL_COMMUNITY': 'more',
-        'GNU_GFDL_NO_OPTIONS': 'more',
+        'GNU_FDL_NO_OPTIONS': 'more',
         'MPL': 'more',
         'OFL': 'more',
         'OPEN_SOFTWARE': 'more',

=== modified file 'lib/lp/registry/doc/product-widgets.txt'
--- lib/lp/registry/doc/product-widgets.txt	2012-12-10 13:43:47 +0000
+++ lib/lp/registry/doc/product-widgets.txt	2012-12-17 14:57:50 +0000
@@ -275,7 +275,7 @@
     Educational Community Licence view licence
     Public Domain view licence
     Artistic Licence 2.0 view licence
-    GNU GFDL no options view licence
+    GNU FDL no options view licence
     Python Licence view licence
     Common Public Licence view licence
     Mozilla Public Licence view licence

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2012-12-04 13:58:57 +0000
+++ lib/lp/registry/interfaces/product.py	2012-12-17 14:57:50 +0000
@@ -246,7 +246,7 @@
         'ACADEMIC', 'APACHE', 'ARTISTIC', 'ARTISTIC_2_0',
         'BSD', 'COMMON_PUBLIC',
         'CC_BY', 'CC_BY_SA', 'CC_0', 'ECLIPSE',
-        'EDUCATIONAL_COMMUNITY', 'AFFERO', 'GNU_GFDL_NO_OPTIONS',
+        'EDUCATIONAL_COMMUNITY', 'AFFERO', 'GNU_FDL_NO_OPTIONS',
         'GNU_GPL_V2', 'GNU_GPL_V3', 'GNU_LGPL_V2_1', 'GNU_LGPL_V3', 'MIT',
         'MPL', 'OFL', 'OPEN_SOFTWARE', 'PERL', 'PHP', 'PUBLIC_DOMAIN',
         'PYTHON', 'ZPL',
@@ -327,8 +327,8 @@
     CC_0 = DBItem(
         320, 'Creative Commons - No Rights Reserved',
         url='http://creativecommons.org/about/cc0')
-    GNU_GFDL_NO_OPTIONS = DBItem(
-        330, "GNU GFDL no options",
+    GNU_FDL_NO_OPTIONS = DBItem(
+        330, "GNU FDL no options",
         url='http://www.gnu.org/copyleft/fdl.html')
     OFL = DBItem(
         340, "Open Font Licence v1.1",

=== modified file 'lib/lp/registry/javascript/tests/test_product_views.html'
--- lib/lp/registry/javascript/tests/test_product_views.html	2012-10-26 09:54:28 +0000
+++ lib/lp/registry/javascript/tests/test_product_views.html	2012-12-17 14:57:50 +0000
@@ -390,8 +390,8 @@
                                                     "font-weight: normal"><input class=
                                                     "checkboxType" id="field.licenses.12"
                                                     name="field.licenses" type="checkbox"
-                                                    value="GNU_GFDL_NO_OPTIONS">&nbsp;GNU
-                                                    GFDL no options&nbsp;<a href=
+                                                    value="GNU_FDL_NO_OPTIONS">&nbsp;GNU
+                                                    FDL no options&nbsp;<a href=
                                                     "http://www.gnu.org/copyleft/fdl.html";
                                                     class=
                                                     "sprite external-link action-icon">view