← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~chrisjohnston/launchpad/181725 into lp:launchpad

 

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

Commit message:
Changes Domain to Web site URL for distros

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #181725 in Launchpad itself: "Distribution "Domain" isn't useful"
  https://bugs.launchpad.net/launchpad/+bug/181725

For more details, see:
https://code.launchpad.net/~chrisjohnston/launchpad/181725/+merge/140653
-- 
https://code.launchpad.net/~chrisjohnston/launchpad/181725/+merge/140653
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~chrisjohnston/launchpad/181725 into lp:launchpad.
=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py	2012-11-02 00:53:58 +0000
+++ lib/lp/registry/interfaces/distribution.py	2012-12-19 12:49:22 +0000
@@ -208,8 +208,8 @@
             required=True))
     domainname = exported(
         TextLine(
-            title=_("Domain name"),
-            description=_("The distro's domain name."), required=True),
+            title=_("Web site URL"),
+            description=_("The distro's web site URL."), required=True),
         exported_as='domain_name')
     owner = exported(
         PublicPersonChoice(

=== modified file 'lib/lp/registry/templates/distros-index.pt'
--- lib/lp/registry/templates/distros-index.pt	2011-03-04 14:39:42 +0000
+++ lib/lp/registry/templates/distros-index.pt	2012-12-19 12:49:22 +0000
@@ -27,7 +27,7 @@
       <thead>
         <tr>
           <th>Distribution</th>
-          <th>Domain</th>
+          <th>Web site URL</th>
         </tr>
       </thead>
       <tbody>
@@ -52,7 +52,7 @@
       <thead>
         <tr>
           <th>Distribution</th>
-          <th>Domain</th>
+          <th>Web site URL</th>
         </tr>
       </thead>
       <tbody>

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distribution-add.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distribution-add.txt	2011-03-03 16:42:05 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distribution-add.txt	2012-12-19 12:49:22 +0000
@@ -33,7 +33,7 @@
   >>> admin_browser.getControl("Title").value = 'The Test Distribution'
   >>> admin_browser.getControl("Summary").value = 'Test Distro Summary'
   >>> admin_browser.getControl("Description").value = 'Test Distro Description'
-  >>> admin_browser.getControl("Domain name").value = 'foo.com'
+  >>> admin_browser.getControl("Web site URL").value = 'foo.com'
   >>> admin_browser.getControl("Members").value = 'mark'
 
   >>> admin_browser.getControl("Save").click()