launchpad-reviewers team mailing list archive

[Bayard 'kit' Randel <kit.randel@xxxxxxxxxxxxx>]

Bayard 'kit' Randel has proposed merging lp:~blr/launchpad/project-configuration-rename into lp:launchpad.

Commit message:
Rename project configuration links to be consistent with the top navigation bar.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~blr/launchpad/project-configuration-rename/+merge/261918
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~blr/launchpad/project-configuration-rename into lp:launchpad.

=== modified file 'lib/lp/blueprints/stories/standalone/xx-batching.txt'
--- lib/lp/blueprints/stories/standalone/xx-batching.txt	2010-09-16 16:47:37 +0000
+++ lib/lp/blueprints/stories/standalone/xx-batching.txt	2015-06-15 03:51:53 +0000
@@ -28,7 +28,7 @@
 
   >>> browser.open("http://blueprints.launchpad.dev/big-project";)
   >>> print extract_text(find_main_content(browser.contents))
-  Blueprints...does not know how...Configure blueprints...
+  Blueprints...does not know how...Configure Blueprints...
 
 But it's easy to change that.
   

=== modified file 'lib/lp/bugs/stories/bugs/xx-front-page-info.txt'
--- lib/lp/bugs/stories/bugs/xx-front-page-info.txt	2011-12-24 15:18:32 +0000
+++ lib/lp/bugs/stories/bugs/xx-front-page-info.txt	2015-06-15 03:51:53 +0000
@@ -34,7 +34,7 @@
     >>> enable_tracker = find_tag_by_id(
     ...     admin_browser.contents, 'no-malone-edit')
     >>> print extract_text(enable_tracker)
-    Configure bug tracker
+    Configure Bugs
 
 The +bugs page for a project using Launchpad for bug tracking
 shows controls for setting bug supervisor and states that no

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2015-06-12 07:25:05 +0000
+++ lib/lp/code/browser/branchlisting.py	2015-06-15 03:51:53 +0000
@@ -1138,7 +1138,7 @@
             return None
         series_menu = MenuAPI(self.context.development_focus).overview
         set_branch = series_menu['set_branch']
-        set_branch.text = 'Configure code hosting'
+        set_branch.text = 'Configure code'
         return set_branch
 
 

=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
--- lib/lp/code/browser/tests/test_branchlisting.py	2015-06-12 07:25:05 +0000
+++ lib/lp/code/browser/tests/test_branchlisting.py	2015-06-15 03:51:53 +0000
@@ -656,7 +656,7 @@
         product = self.factory.makeProduct()
         browser = self.getUserBrowser(
             canonical_url(product, rootsite='code'))
-        self.assertFalse('Configure code hosting' in browser.contents)
+        self.assertFalse('Configure code' in browser.contents)
 
     def test_configure_codehosting_shown(self):
         # If the user has driver permissions, they are shown the configure
@@ -664,7 +664,7 @@
         product = self.factory.makeProduct()
         browser = self.getUserBrowser(
             canonical_url(product, rootsite='code'), user=product.owner)
-        self.assertTrue('Configure code hosting' in browser.contents)
+        self.assertTrue('Configure code' in browser.contents)
 
 
 class TestPersonBranchesPage(BrowserTestCase):

=== modified file 'lib/lp/code/stories/branches/xx-product-branches.txt'
--- lib/lp/code/stories/branches/xx-product-branches.txt	2015-06-02 06:35:38 +0000
+++ lib/lp/code/stories/branches/xx-product-branches.txt	2015-06-15 03:51:53 +0000
@@ -216,7 +216,7 @@
     >>> admin_browser.open('http://code.launchpad.dev/firefox')
     >>> print_links(admin_browser)
     Import a branch
-    Configure code hosting
+    Configure code
 
 The owner of the project sees the links for the activities he can
 perform, everything except defining branch visibility.
@@ -225,7 +225,7 @@
     >>> owner_browser.open('http://code.launchpad.dev/firefox')
     >>> print_links(owner_browser)
     Import a branch
-    Configure code hosting
+    Configure code
 
 And a regular user can only register and import branches.
 

=== modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2015-06-12 14:20:12 +0000
+++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2015-06-15 03:51:53 +0000
@@ -37,12 +37,12 @@
 
     >>> owner_browser = setupBrowser(auth="Basic test@xxxxxxxxxxxxx:test")
     >>> owner_browser.open('http://code.launchpad.dev/firefox')
-    >>> owner_browser.getLink('Configure code hosting').click()
+    >>> owner_browser.getLink('Configure code').click()
+    >>> owner_browser.getControl('Bazaar').click()
     >>> owner_browser.getControl(
     ...     'Import a branch').click()
     >>> owner_browser.getControl('Branch URL').value = (
     ...     'git://example.com/firefox')
-    >>> owner_browser.getControl('Git').click()
     >>> owner_browser.getControl('Branch name').value = 'trunk'
     >>> owner_browser.getControl('Update').click()
 

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2015-06-10 10:19:25 +0000
+++ lib/lp/registry/browser/product.py	2015-06-15 03:51:53 +0000
@@ -350,8 +350,8 @@
         series_menu = MenuAPI(self.context.development_focus).overview
         configuration_names = [
             'configure_bugtracker',
+            'configure_translations',
             'configure_answers',
-            'configure_translations',
             #'configure_blueprints',
             ]
         config_list = []
@@ -362,9 +362,9 @@
 
         # Add the branch configuration in separately.
         set_branch = series_menu['set_branch']
-        set_branch.text = 'Configure project branch'
+        set_branch.text = 'Code'
         set_branch.summary = "Specify the location of this project's code."
-        config_list.append(
+        config_list.insert(0,
             dict(link=set_branch,
                  configured=config_statuses['configure_codehosting']))
         return config_list
@@ -418,25 +418,25 @@
 
     @enabled_with_permission('launchpad.BugSupervisor')
     def configure_bugtracker(self):
-        text = 'Configure bug tracker'
+        text = 'Bugs'
         summary = 'Specify where bugs are tracked for this project'
         return Link('+configure-bugtracker', text, summary, icon='edit')
 
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def configure_translations(self):
-        text = 'Configure translations'
+        text = 'Translations'
         summary = 'Allow users to submit translations for this project'
         return Link('+configure-translations', text, summary, icon='edit')
 
     @enabled_with_permission('launchpad.Edit')
     def configure_answers(self):
-        text = 'Configure support tracker'
+        text = 'Answers'
         summary = 'Allow users to ask questions on this project'
         return Link('+configure-answers', text, summary, icon='edit')
 
     @enabled_with_permission('launchpad.Edit')
     def configure_blueprints(self):
-        text = 'Configure blueprints'
+        text = 'Blueprints'
         summary = 'Enable tracking of feature planning.'
         return Link('+configure-blueprints', text, summary, icon='edit')
 

=== modified file 'lib/lp/registry/stories/product/xx-product-development-focus.txt'
--- lib/lp/registry/stories/product/xx-product-development-focus.txt	2012-11-08 03:55:11 +0000
+++ lib/lp/registry/stories/product/xx-product-development-focus.txt	2015-06-15 03:51:53 +0000
@@ -73,14 +73,14 @@
      Change details
      (http://launchpad.dev/fooix/+edit)
     >>> print_involvement_portlet(owner_browser)
-    Configure bug tracker
+    Code
+    http://launchpad.dev/fooix/trunk/+setbranch
+    Bugs
     http://launchpad.dev/fooix/+configure-bugtracker
-    Configure support tracker
+    Translations
+    http://launchpad.dev/fooix/+configure-translations
+    Answers
     http://launchpad.dev/fooix/+configure-answers
-    Configure translations
-    http://launchpad.dev/fooix/+configure-translations
-    Configure project branch
-    http://launchpad.dev/fooix/trunk/+setbranch
 
 The owner can specify the development focus branch from the overview page.
 

=== modified file 'lib/lp/translations/stories/productseries/xx-productseries-translations.txt'
--- lib/lp/translations/stories/productseries/xx-productseries-translations.txt	2014-11-24 09:16:35 +0000
+++ lib/lp/translations/stories/productseries/xx-productseries-translations.txt	2015-06-15 03:51:53 +0000
@@ -181,11 +181,11 @@
     Launchpad allows communities to translate projects using
     imports or a branch.
     Getting started with translating your project in Launchpad
-    Configure translations
+    Translations
 
 The notice links to the page for configuring translations on the project.
 
-    >>> owner_browser.getLink('Configure translations').click()
+    >>> owner_browser.getLink('Translations', index=1).click()
     >>> print owner_browser.url
     http://.../bazaar/+configure-translations
 
@@ -204,7 +204,7 @@
     Launchpad allows communities to translate projects using
     imports or a branch.
     Getting started with translating your project in Launchpad
-    Configure translations
+    Translations
 
 A Translations admin who is neither a Launchpad admin nor the project
 owner (and so won't be able to change the project's settings) sees the

=== modified file 'lib/lp/translations/stories/standalone/xx-product-translations.txt'
--- lib/lp/translations/stories/standalone/xx-product-translations.txt	2014-11-27 22:13:36 +0000
+++ lib/lp/translations/stories/standalone/xx-product-translations.txt	2015-06-15 03:51:53 +0000
@@ -53,7 +53,7 @@
     Launchpad allows communities to translate projects using imports or a
     branch.
     Getting started with translating your project in Launchpad
-    Configure translations
+    Translations
 
     >>> registrant.getLink(
     ...     url=('/gnomebaker/trunk/'
@@ -64,7 +64,7 @@
 configuration page, where they can configure the project to use
 Launchpad for translations if desired.
 
-    >>> registrant.getLink('Configure translations').click()
+    >>> registrant.getLink('Translations').click()
     >>> print registrant.url
     http://.../gnomebaker/+configure-translations
 
@@ -133,7 +133,7 @@
 If the netapplet project is updated to use Launchpad for translations...
 
     >>> admin_browser.open('http://launchpad.dev/netapplet')
-    >>> admin_browser.getLink('Configure translations').click()
+    >>> admin_browser.getLink('Translations', index=1).click()
     >>> print_radio_button_field(admin_browser.contents, "translations_usage")
     (*) Unknown
     ( ) Launchpad
@@ -144,9 +144,9 @@
 
 ...there are no longer any obsolete entries.
 
-    >>> admin_browser.getLink('Translations').click()
+    >>> admin_browser.getLink('Translations', index=1).click()
     >>> print admin_browser.title
-    Translations : NetApplet
+    Configure translations : Translations : NetApplet
     >>> print find_tag_by_id(admin_browser.contents,
     ...                'portlet-obsolete-translatable-series')
     None
@@ -230,5 +230,5 @@
     >>> notice = first_tag_by_class(admin_browser.contents, 'notice')
     >>> print extract_text(notice)
     Getting started with translating your project in Launchpad
-    Configure translations
+    Translations
     There are no translations for this project.

=== modified file 'lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt'
--- lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt	2011-12-08 18:47:23 +0000
+++ lib/lp/translations/stories/translationfocus/xx-product-translationfocus.txt	2015-06-15 03:51:53 +0000
@@ -18,7 +18,7 @@
     >>> print extract_text(
     ...     find_tags_by_class(admin_browser.contents,
     ...                        'menu-link-configure_translations')[0])
-    Configure translations
+    Translations
 
     >>> browser.open(fooproject_url)
     >>> print extract_text(

=== modified file 'lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt'
--- lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt	2012-01-15 13:32:27 +0000
+++ lib/lp/translations/stories/translationgroups/xx-change-translation-policy.txt	2015-06-15 03:51:53 +0000
@@ -23,13 +23,13 @@
 
     >>> re_browser.open(
     ...     'http://translations.launchpad.dev/chestii')
-    >>> re_browser.getLink('Configure translations').click()
+    >>> re_browser.getLink('Configure Translations').click()
     >>> print re_browser.url
     http://translations.launchpad.dev/chestii/+configure-translations
 
     >>> po_browser.open(
     ...     'http://translations.launchpad.dev/chestii')
-    >>> po_browser.getLink('Configure translations').click()
+    >>> po_browser.getLink('Configure Translations').click()
     >>> print po_browser.url
     http://translations.launchpad.dev/chestii/+configure-translations
 
@@ -57,7 +57,7 @@
 
     >>> dtc_browser.open(
     ...     'http://translations.launchpad.dev/chestii')
-    >>> dtc_browser.getLink('Configure translations')
+    >>> dtc_browser.getLink('Configure Translations')
     Traceback (most recent call last):
     ...
     LinkNotFoundError...

=== modified file 'lib/lp/translations/stories/translationgroups/xx-translationgroups.txt'
--- lib/lp/translations/stories/translationgroups/xx-translationgroups.txt	2014-02-19 02:11:16 +0000
+++ lib/lp/translations/stories/translationgroups/xx-translationgroups.txt	2015-06-15 03:51:53 +0000
@@ -263,7 +263,7 @@
 Other users cannot access this page, nor see the menu link to it.
 
     >>> user_browser.open(anon_browser.url)
-    >>> user_browser.getLink('Configure translations').click()
+    >>> user_browser.getLink('Configure Translations').click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError
@@ -315,7 +315,7 @@
     ...     auth='Basic test@xxxxxxxxxxxxx:test')
     >>> netapplet_owner_browser.open('http://launchpad.dev/netapplet')
     >>> netapplet_owner_browser.getLink(
-    ...   'Configure translations').click()
+    ...   'Translations', index=1).click()
     >>> print netapplet_owner_browser.title
     Configure translations : Translations : NetApplet
 
@@ -341,7 +341,7 @@
 group and permissions.
 
     >>> translations_page_url = netapplet_owner_browser.url
-    >>> netapplet_owner_browser.getLink('Configure translations').click()
+    >>> netapplet_owner_browser.getLink('Configure Translations').click()
     >>> change_translators_url = netapplet_owner_browser.url
 
     >>> print netapplet_owner_browser.title
@@ -356,11 +356,11 @@
     ...     'Translation group').displayValue
     ['(nothing selected)']
 
-Ordinary users cannot see the "Configure translations" link or the page it
+Ordinary users cannot see the "Configure Translations" link or the page it
 leads to.
 
     >>> user_browser.open(translations_page_url)
-    >>> user_browser.getLink('Configure translations').click()
+    >>> user_browser.getLink('Configure Translations').click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError
@@ -1001,7 +1001,7 @@
 First, we verify that netapplet is using Launchpad Translations.
 
     >>> admin_browser.open('http://launchpad.dev/netapplet')
-    >>> admin_browser.getLink('Configure translations').click()
+    >>> admin_browser.getLink('Translations', index=1).click()
     >>> print_radio_button_field(admin_browser.contents, "translations_usage")
     ( ) Unknown
     (*) Launchpad
@@ -1015,7 +1015,7 @@
 as the translation group for the netapplet product...
 
     >>> admin_browser.getLink('Translations').click()
-    >>> admin_browser.getLink('Configure translations').click()
+    >>> admin_browser.getLink('Configure Translations').click()
     >>> admin_browser.getControl('Translation group').displayOptions
     ['(nothing selected)', 'Single-language Translators',
      'The PolyGlot Translation Group', 'Just a testing team']