Description of problem: We tend to flip flop on how much we capitalize some of our acronyms, while most of the time we capitalize URL, we also say just url or Url from time to time, same with id, Id, and ID, and to a much lesser extent, http/HTTP. There's also a lone reference to cpu, which should probably be CPU. url -> URL, Url -> URL #: ../src/subscription_manager/managercli.py:93 #, python-format msgid "Repo Url: \t%s" 1. "Repo URL: \t%s" #: ../src/subscription_manager/managercli.py:217 msgid "server url in the form of https://hostname:443/prefix" 2. "server URL in the form of https://hostname:443/prefix" #: ../src/subscription_manager/managercli.py:222 msgid "proxy url in the form of proxy_hostname:proxy_port" 3. "proxy URL in the form of proxy_hostname:proxy_port" #: ../src/subscription_manager/managercli.py:848 msgid "base url for content in form of https://hostname:443/prefix" 4. "base URL for content in form of https://hostname:443/prefix" #: ../src/subscription_manager/utils.py:219 msgid "Server url port could not be parsed" 5. "Server URL port could not be parsed" #: ../src/subscription_manager/utils.py:236 msgid "Server url port should be numeric" 6. "Server URL port should be numeric" #: ../src/subscription_manager/hwprobe.py:255 msgid "Error reading system cpu information:" 7, "Error reading system CPU information:" #: ../src/subscription_manager/managercli.py:342 #: ../bin/rhn-migrate-classic-to-rhsm:208 #, c-format, python-format msgid "Error parsing serverurl: %s" "8. Error parsing serverURL: %s" (use your best judgment if we should modify URL when used in this context) #: ../src/subscription_manager/managercli.py:373 #, python-format msgid "Error parsing baseurl: %s" 9. "Error parsing baseURL: %s" (use your best judgment if we should modify URL when used in this context) cpu -> CPU #: ../src/subscription_manager/hwprobe.py:255 msgid "Error reading system cpu information:" 10. "Error reading system CPU information:" id -> ID, Id -> ID #: ../src/subscription_manager/managercli.py:1253 msgid "the id of the pool to attach (can be specified more than once)" 11. "the ID of the pool to attach (can be specified more than once)" #: ../src/subscription_manager/managercli.py:1311 msgid "Please enter a valid numeric pool id." 12. "Please enter a valid numeric pool ID." #: ../src/subscription_manager/managercli.py:1678 #, python-format msgid "Error: %s is not a valid repo id. Use --list option to see valid repos." 13. "Error: %s is not a valid repo ID. Use --list option to see valid repos." #: ../src/subscription_manager/managercli.py:82 #, python-format msgid "Pool Id: \t%s" 14. "Pool ID: \t%s" #: ../src/subscription_manager/managercli.py:91 #, python-format msgid "Repo Id: \t%s" 15. "Repo ID: \t%s" #: ../bin/rhn-migrate-classic-to-rhsm:324 msgid "Unable to locate SystemId file. Is this system registered?" 16. "Unable to locate SystemID file. Is this system registered?" http -> HTTP #: ../src/subscription_manager/managercli.py:224 msgid "user for http proxy with basic authentication" 17. "user for HTTP proxy with basic authentication" #: ../src/subscription_manager/managercli.py:226 msgid "password for http proxy with basic authentication" 18. "password for HTTP proxy with basic authentication" Version-Release number of selected component (if applicable): subscription-manager-1.8.0-1 Additional info:
* If url is used as part of hte option (8,9) then it should not be capitalized. * Satellite/Spacealk uses the string SystemId (16) therefore not changing.
https://github.com/candlepin/subscription-manager/pull/442
commit 65f57ee7581bd13573ee2bb5e2dd43b6cc8bd8ad Author: Bryan Kearney <bkearney> Date: Fri Dec 7 14:15:07 2012 -0500 878634: Improve the consistency of capitalization of URL, ID, HTTP, and CPU
Sounds good.
Fixed in the 1.8.2 version of subscription-manager or python-rhsm
[jsefler@jseflerT5400 subscription-manager]$ git show-ref | head -1 50cbc396b9d5689d1b0ad502f8cb357b1e540f11 refs/heads/master These msgid (used by "rct cat-manifest MANIFEST_FILE") also need an update to "ID": msgid "Product Id" msgid "Subscription Id"
commit 24a095e9bb9a5dd6572e280327dd1f5c45c1ecca Author: Bryan Kearney <bkearney> Date: Fri Feb 22 12:57:13 2013 -0500 878634: Use correct capitalization for ID in the rct tool
(In reply to comment #6) > msgid "Subscription Id" this msgid was altered to "Order Number" by bug 913720
This request was evaluated by Red Hat Product Management for inclusion in a Red Hat Enterprise Linux release. Product Management has requested further review of this request by Red Hat Engineering, for potential inclusion in a Red Hat Enterprise Linux release for currently deployed products. This request is not yet committed for inclusion in a release.
(In reply to comment #6) > msgid "Product Id" this msgid was altered to "SKU" by bug 913703
Testing Version... [root@jsefler-5 ~]# rpm -q subscription-manager subscription-manager-1.8.5-1.el5 [root@jsefler-5 ~]# msgunfmt --no-wrap /usr/share/locale/ru/LC_MESSAGES/rhsm.mo | grep -i "cpu" -A1 | grep msgid msgid "Error reading system CPU information:" VERIFIED: all cpu acronyms have been uppercased [root@jsefler-5 ~]# msgunfmt --no-wrap /usr/share/locale/ru/LC_MESSAGES/rhsm.mo | grep -i "url" -A1 | grep msgid msgid "Error parsing baseurl: %s" msgid "Error parsing server URL: %s" msgid "Error parsing serverurl: %s" msgid "Repo URL:" msgid "Server URL can not be None" msgid "Server URL can not be empty" msgid "Server URL has an invalid scheme. http:// and https:// are supported" msgid "Server URL is just a schema. Should include hostname, and/or port and path" msgid "Server URL port could not be parsed" msgid "Server URL port should be numeric" msgid "URL" msgid "base URL for content in form of https://hostname:443/prefix" msgid "proxy URL in the form of proxy_hostname:proxy_port" msgid "server URL in the form of https://hostname:443/prefix" VERIFIED: all url/Url acronyms have been uppercased where appropriate [root@jsefler-5 ~]# msgunfmt --no-wrap /usr/share/locale/ru/LC_MESSAGES/rhsm.mo | grep -i "http" -A1 | grep msgid msgid "<b>HTTP Proxy</b>" msgid "I would like to connect via an _HTTP proxy." msgid "Server URL has an invalid scheme. http:// and https:// are supported" msgid "Tip: Forgot your login or password? Look it up at http://redhat.com/forgot_password" msgid "To learn how to unregister from either service please consult this Knowledge Base Article: https://access.redhat.com/kb/docs/DOC-45563" msgid "To learn more about RHN registration and technologies please consult this Knowledge Base Article: https://access.redhat.com/kb/docs/DOC-45563" msgid "Use Au_thentication with HTTP Proxy:" msgid "base URL for content in form of https://hostname:443/prefix" msgid "password for HTTP proxy with basic authentication" msgid "server URL in the form of https://hostname:443/prefix" msgid "user for HTTP proxy with basic authentication" VERIFIED: all http acronyms have been uppercased where appropriate [root@jsefler-5 ~]# msgunfmt --no-wrap /usr/share/locale/ru/LC_MESSAGES/rhsm.mo | grep -i " id" -A1 | grep msgid msgid "Current identity is: %s" msgid "Display the identity certificate for this system or request a new one" msgid "Error: %s is not a valid repo ID. Use --list option to see valid repos." msgid "Error: Activation keys can not be used with previously registered ids." <=== FAILED_QA msgid "Error: Unable to generate a new identity for the system" msgid "Organization ID:" msgid "Please enter a valid numeric pool ID." msgid "Pool ID" msgid "Pool ID:" msgid "Product ID:" msgid "Repo ID:" msgid "Stacking ID" msgid "Subject Key ID size: %db" msgid "The system has been registered with id: %s " <=== FAILED_QA msgid "Unable to verify server's identity: %s" msgid "Your identity certificate has expired" msgid "org id: %s" <=== FAILED_QA msgid "the ID of the pool to attach (can be specified more than once)" FAILED_QA: three msgids above need an uppercased "id"
https://github.com/candlepin/subscription-manager/pull/569
The latest fix is in commit 1d456b7b309a8ff6b30dae468b57711eca23f7ea Merge: 709e459 c859ebb Author: Adrian Likins <alikins> Date: Wed Apr 17 09:28:16 2013 -0700 Merge pull request #569 from candlepin/bkearney/878634 878634: Fix the final three uses of id instead of ID You may need to wait to validate until the next strings are extracted.
# rpm -qa | egrep "subscription-manager|python-rhsm" python-rhsm-1.8.9-1.git.7.214419e.el5 subscription-manager-migration-data-1.11.2.7-1.git.0.1dfd00e.el5 subscription-manager-gui-1.8.6-1.git.4.b3f4bbf.el5 subscription-manager-firstboot-1.8.6-1.git.4.b3f4bbf.el5 subscription-manager-migration-1.8.6-1.git.4.b3f4bbf.el5 subscription-manager-1.8.6-1.git.4.b3f4bbf.el5 # msgunfmt --no-wrap /usr/share/locale/ru/LC_MESSAGES/rhsm.mo | grep -i " id" -A1 | grep msgid msgid "Current identity is: %s" msgid "Display the identity certificate for this system or request a new one" msgid "Error: %s is not a valid repo ID. Use --list option to see valid repos." msgid "Error: Unable to generate a new identity for the system" msgid "Organization ID:" msgid "Please enter a valid numeric pool ID." msgid "Pool ID" msgid "Pool ID:" msgid "Product ID:" msgid "Repo ID:" msgid "Stacking ID" msgid "Subject Key ID size: %db" msgid "Unable to verify server's identity: %s" msgid "Your identity certificate has expired" msgid "the ID of the pool to attach (can be specified more than once)" VERIFIED for ID
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. http://rhn.redhat.com/errata/RHBA-2013-1332.html