Merge lp:~bac/launchpad/bug-436508-ssh into lp:launchpad

Proposed by Brad Crittenden
Status: Merged
Approved by: Edwin Grubbs
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~bac/launchpad/bug-436508-ssh
Merge into: lp:launchpad
Diff against target: 59 lines
3 files modified
lib/lp/registry/browser/person.py (+1/-1)
lib/lp/registry/stories/foaf/xx-add-sshkey.txt (+4/-4)
lib/lp/registry/templates/person-portlet-contact-details.pt (+1/-1)
To merge this branch: bzr merge lp:~bac/launchpad/bug-436508-ssh
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) code Approve
Review via email: mp+13847@code.launchpad.net

Commit message

Correct 'SSH keys' capitalization.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

= Summary =

Trivial fix for bug 436508 to correct the capitalization.

== Proposed fix ==

'SSH Keys' -> 'SSH keys'

== Pre-implementation notes ==

None

== Implementation details ==

N/A

== Tests ==

bin/test -vvt xx-add-sshkey.txt

== Demo and Q/A ==

Go to https://launchpad.dev/~mark and verify the text is correct.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/stories/foaf/xx-add-sshkey.txt
  lib/lp/registry/templates/person-portlet-contact-details.pt
  lib/lp/registry/browser/person.py

== Pylint notices ==

lib/lp/registry/browser/person.py
    117: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    118: [F0401] Unable to import 'lazr.config' (No module named config)
    119: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Looks good.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2009-10-19 22:49:43 +0000
+++ lib/lp/registry/browser/person.py 2009-10-26 18:25:20 +0000
@@ -1071,7 +1071,7 @@
1071 @enabled_with_permission('launchpad.Special')1071 @enabled_with_permission('launchpad.Special')
1072 def sshkeys(self):1072 def sshkeys(self):
1073 target = '+editsshkeys'1073 target = '+editsshkeys'
1074 text = 'SSH Keys'1074 text = 'SSH keys'
1075 return Link(target, text)1075 return Link(target, text)
10761076
1077 def gpgkeys(self):1077 def gpgkeys(self):
10781078
=== modified file 'lib/lp/registry/stories/foaf/xx-add-sshkey.txt'
--- lib/lp/registry/stories/foaf/xx-add-sshkey.txt 2009-09-18 15:24:30 +0000
+++ lib/lp/registry/stories/foaf/xx-add-sshkey.txt 2009-10-26 18:25:20 +0000
@@ -15,9 +15,9 @@
15 Sample Person in Launchpad15 Sample Person in Launchpad
16 >>> print extract_text(16 >>> print extract_text(
17 ... find_tag_by_id(anon_browser.contents, 'sshkeys'))17 ... find_tag_by_id(anon_browser.contents, 'sshkeys'))
18 SSH Keys: andrew@trogdor18 SSH keys: andrew@trogdor
1919
20Salgado does not have a key, so we omit the 'SSH Keys' section for anonymous20Salgado does not have a key, so we omit the 'SSH keys' section for anonymous
21users.21users.
2222
23 >>> anon_browser.open('http://launchpad.dev/~salgado')23 >>> anon_browser.open('http://launchpad.dev/~salgado')
@@ -35,7 +35,7 @@
35 Guilherme Salgado in Launchpad35 Guilherme Salgado in Launchpad
36 >>> print extract_text(36 >>> print extract_text(
37 ... find_tag_by_id(browser.contents, 'sshkeys'))37 ... find_tag_by_id(browser.contents, 'sshkeys'))
38 SSH Keys: Add an SSH key38 SSH keys: Add an SSH key
39 No SSH keys registered.39 No SSH keys registered.
4040
4141
@@ -110,7 +110,7 @@
110 Guilherme Salgado in Launchpad110 Guilherme Salgado in Launchpad
111 >>> print extract_text(111 >>> print extract_text(
112 ... find_tag_by_id(browser.contents, 'sshkeys'))112 ... find_tag_by_id(browser.contents, 'sshkeys'))
113 SSH Keys: Update SSH keys113 SSH keys: Update SSH keys
114 salgado@canario114 salgado@canario
115 salgado@canario115 salgado@canario
116 >>> browser.getLink('Update SSH keys').click()116 >>> browser.getLink('Update SSH keys').click()
117117
=== modified file 'lib/lp/registry/templates/person-portlet-contact-details.pt'
--- lib/lp/registry/templates/person-portlet-contact-details.pt 2009-09-16 17:56:17 +0000
+++ lib/lp/registry/templates/person-portlet-contact-details.pt 2009-10-26 18:25:20 +0000
@@ -155,7 +155,7 @@
155 </dl>155 </dl>
156156
157 <dl id="sshkeys" tal:condition="view/should_show_sshkeys_section">157 <dl id="sshkeys" tal:condition="view/should_show_sshkeys_section">
158 <dt>SSH Keys:158 <dt>SSH keys:
159 <a tal:replace="structure overview_menu/editsshkeys/fmt:icon" />159 <a tal:replace="structure overview_menu/editsshkeys/fmt:icon" />
160 </dt>160 </dt>
161 <dd tal:define="sshkeys context/sshkeys">161 <dd tal:define="sshkeys context/sshkeys">