Univention Bugzilla – Bug 48698
Fix spelling errors
Last modified: 2021-05-25 10:16:13 CEST
find \( -name \*.m4 -o -name shim -o -name \*.csv -o -name \*.ldif -o -name \*.po -o -name \*.class -o -name \*.efi -o -name \*.efi.signed -o -name \*.gd2 -o -name \*.xcf -o -name \*.pyc -o -name \*.gpg -o -name \*.jpeg -o -name \*.cer -o -name \*.der -o -name \*.png.fallback -o -name \*.gif -o -name \*.deb -o -name \*.ai -o -name \*.odg -o -name \*.cvd -o -name \*.zip -o -name \*.svg -o -name \*.svgz -o -name \*.ico -o -name \*.iso -o -name \*.gz -o -name \*.xz -o -name \*.mo -o -name \*.jpg -o -name .git -o -name \*.png -o -name \*.pdf -o -name \*.ttf -o -name \*.woff -o -name \*.swf \) -prune -o -type f -exec codespell -s -c {}
You have to apppend "+" to the command. *.pyc → *.py
(In reply to Florian Best from comment #1) > You have to apppend "+" to the command. Yes > *.pyc → *.py No <https://git.knut.univention.de/univention/ucs/tree/phahn/48698-spell> QA: git log --grep='Bug #48698 spell:' -p --word-diff=color --word-diff-regex='[0-9A-Za-z_]+' '@{u}..HEAD' -- . ':!**/debian/changelog' The following changes are "real" bugs, e.g. changes of wrong code: desktop/univention-kdm/themes/ucs/ucs.xml <https://git.knut.univention.de/univention/ucs/commit/ed9c5e3a4803c7054cce4c75ed5e8e26cadbc90f> <https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/width> management/univention-management-console/univention-management-console-web-server <https://git.knut.univention.de/univention/ucs/commit/f8eea1f3eb7815d544e5b43be87c303d015fc084#754ccd96bed19dd32ffb5efac1ebb1ba69883b7d_1583_1582> <https://docs.python.org/2/library/threading.html#threading.Thread.daemon> services/univention-samba/samba-privileges.py <https://git.knut.univention.de/univention/ucs/commit/e6e952ecc72deef47dfa6801543241d8534408e5#98e1ad846724bf1c62211c72d2ce1867922824fb_58_57> <http://docs.software-univention.de/developer-reference-4.3.html#listener:handler> test/ucs-test/tests/09_updater/pool.sh <https://git.knut.univention.de/univention/ucs/commit/e05c26291f1b068aa7ee29ef4c118fadd3bf6176#a1c5eea3f873ae10e8fdf1b8459aabfaf8f182ef_35_34> <https://www.gnu.org/software/bash/manual/html_node/Shell-Functions.html#Shell-Functions>
Created attachment 9847 [details] Find and fix spelling errors
Most of the changes are to "**/debian/changelog" and/or comments and/or Python doc-strings. To filter them out you can use gits "textconv" filter by adding this to .git/info/attributes: *.c diff=strip-comment-c *.h diff=strip-comment-c *.js diff=strip-comment-c *.py diff=strip-comment-py *.sh diff=strip-comment-sh *.inst diff=strip-comment-sh *.script diff=strip-comment-sh *.conf diff=strip-comment-sh *.preinst diff=strip-comment-sh *.postinst diff=strip-comment-sh *.prerm diff=strip-comment-sh *.postrm diff=strip-comment-sh and this to .git/config (or ~/.gitconfig): [diff "podiff"] textconv = ~/REPOS/toolshed/VCS/git-textconv po cachetextconv = true [diff "strip-comment-c"] textconv = ~/REPOS/toolshed/VCS/git-textconv c cachetextconv = true [diff "strip-comment-py"] textconv = ~/REPOS/toolshed/VCS/git-textconv py cachetextconv = true [diff "strip-comment-sh"] textconv = ~/REPOS/toolshed/VCS/git-textconv sh cachetextconv = true Some of the changes fix text strings; the translation-id was updated as well. Some changes are to code; the interesting ones are mentioned in comment 2, but there are some more changing code: <https://git.knut.univention.de/univention/ucs/commit/c77c92db8889681afe02bae927b01d3542c0149f#754ccd96bed19dd32ffb5efac1ebb1ba69883b7d> <https://git.knut.univention.de/univention/ucs/commit/c77c92db8889681afe02bae927b01d3542c0149f#4cd6350a27e6e21093c9347e0cba0b2e900ade99> <https://git.knut.univention.de/univention/ucs/commit/dec596e6a830bcaaf111546a77c51de02ce0c595#9362cda283d3bc4751da814e38d7eb4b5f3e00f5> FYI: Do not change the other "childs" to "children" - that attribute name must stay as it is used by UDM modules.
wdiff: I am unsure about changing the html id. Please revert. +++ b/desktop/univention-kdm/themes/ucs/ucs.xml @@ -124 +124 @@ » » » <item type="label" id="mesage">id="message"> @@ -134 +134 @@ » » <pos anchor="c" x="50%" y="50%" widht="400"width="400" height="400"/> @@ -145 +145 @@ » » <pos anchor="c" x="50%" y="50%" widht="400"width="400" height="400"/> @@ -155 +155 @@ » » » » <text xml:lang="en_US">Intiallyxml:lang="en_US">Initially he shares the password of the "root" user. </text>
Changing things in 3rd party code might be bad?: virtualization/univention-novnc/ Otherwise the rest looks fine.
Apparently the branch has been merged: git log --oneline --grep "Bug #48698" -m de92470f38 plus 93d73916ef Bug #48698 manual: Fix incomplete sentence. a44f0c3474 Bug #48698 spell: Retrun -> Return
(In reply to Arvid Requate from comment #7) > Apparently the branch has been merged: No, only partly: > git log --oneline --grep "Bug #48698" -m de92470f38 only all changes to debian/changelog, which are invisible to users > 93d73916ef Bug #48698 manual: Fix incomplete sentence. Merged change from Feedback by Email > a44f0c3474 Bug #48698 spell: Retrun -> Return Merged while doing PT for UCS-4.4 and hitting that bug. The branch still has 329 pending commits and I'm still trying to separate the user visible changes from the changes to comments and Python API DocStrings. [phahn/48698-spell3] b914f342c2 Bug #45576 spell: Optionenen -> Optionen [phahn/48698-spell3] 75a4880421 Bug #45576 spell: Beszeichnung -> Bezeichnung UCS technical training 2019-03-22/23
OK: 4f8490271cff3c1ffff741abcf4c774e090af4df...91289d2d4f1b8ea2ffabd09760d437b059ab47e8 OK: ffb784175e011fe1a63c19e7f541da487d189587...41f3357f5fc764d4fdc4d38c5dc7ed89c92879a5 OK: 41f3357f5fc764d4fdc4d38c5dc7ed89c92879a5...f06b462d85a832b0048dc05d34dd6e05969ce821
[4.4-1] 86e0fd082f Bug #48698: Fix user visible spelling errors [4.4-1] a843cf36e6 Bug #48698: Fix user visible spelling errors The following packages have been imported and built, but no YAML file was created/modified to not spam our customers with too many errata mails: base/pam-runasroot base/pam-univentionmailcyrus base/univention-base-files base/univention-firewall base/univention-heimdal base/univention-lib base/univention-licence base/univention-pam base/univention-python base/univention-ssl base/univention-system-setup management/univention-appcenter management/univention-directory-listener management/univention-directory-manager-modules management/univention-directory-notifier management/univention-ldap-overlay-memberof management/univention-ldap management/univention-management-console-module-adtakeover management/univention-management-console-module-diagnostic management/univention-management-console-module-ipchange management/univention-management-console nagios/univention-nagios-virtualization services/univention-ad-connector services/univention-admin-diary services/univention-net-installer services/univention-printserver services/univention-remote-backup services/univention-s4-connector services/univention-samba services/univention-samba4
[4.4-1] bd18910fcd Bug #48698: Fix GUI visible spelling errors [4.4-1] ac4db8b252 Bug #48698: Fix GUI visible spelling errors [4.4-1] 3215d66696 Bug #48698 spell GUI: ocurred -> occurred FIX [4.4-1] f752b6fd79 Bug #48698 spell GUI: sucessfully -> successfully FIX The following packages have been imported and built, but no YAML file was created/modified to not spam our customers with too many errata mails: base/univention-l10n-fr base/univention-passwd-cache base/univention-system-activation base/univention-system-setup desktop/univention-kdm management/univention-directory-manager-modules management/univention-join management/univention-management-console-module-diagnostic management/univention-management-console-module-udm management/univention-management-console management/univention-system-info management/univention-web services/univention-ad-connector services/univention-pkgdb All patches except the following have thus been merged; the following patches change the names of misspelled variables - they should be picked up by the maintainers if they agree with the renaming: $ git lp1 --numstat --grep '^Bug #48698 spell CODE:' [phahn/48698-spell7-code] d14450d1a9 Bug #48698 spell CODE: Ressource -> Resource 1 1 management/univention-management-console/src/univention/management/console/protocol/modserver.py 3 3 management/univention-management-console/src/univention/management/console/protocol/server.py 4 4 management/univention-management-console/univention-management-console-web-server 1 1 virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm.css 8 8 virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/TreeModel.js [phahn/48698-spell7-code] 50a8d8d3f3 Bug #48698 spell CODE: reservered -> reserved 2 2 services/univention-squid/squid_ldap_ntlm_auth [phahn/48698-spell7-code] b435bdbb79 Bug #48698 spell CODE: referers -> referrers 2 2 base/univention-system-setup/umc/python/setup/netconf/modules/LdapReferences.py [phahn/48698-spell7-code] 65163e7c1f Bug #48698 spell CODE: proccess -> process 3 3 management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/53_package_status.py [phahn/48698-spell7-code] 3dfa1d9032 Bug #48698 spell CODE: pathes -> paths 10 10 management/univention-management-console-module-udm/src/univention/management/modules/udm/module.py 7 7 packaging/ucslint/ucslint/0020-flake8.py [phahn/48698-spell7-code] 6a6a750fab Bug #48698 spell CODE: invokation -> invocation 5 5 management/univention-appcenter/umc/js/appcenter/AppDetailsPage.js [phahn/48698-spell7-code] 43da81c889 Bug #48698 spell CODE: deamon -> daemon 1 1 management/univention-management-console/univention-management-console-web-server [phahn/48698-spell7-code] 4c32e53df6 Bug #48698 spell CODE: childs -> children 4 4 management/univention-web/js/widgets/ConfirmDialog.js [phahn/48698-spell7-code] 32be114f3c Bug #48698 spell CODE: aggreed -> agreed 4 4 management/univention-appcenter/python/appcenter/actions/install_base.py [phahn/48698-spell7-code] b619fb66ab Bug #48698 spell CODE: adresses -> addresses 2 2 management/univention-directory-manager-modules/univention-dnsedit For two others I have filed separate bugs: Bug #49944: desktop/univention-kdm/themes/ucs/ucs.xml Bug #49945: services/univention-samba/samba-privileges.py No packages will get releases now to not generate a massive amount of errata emials. The changes will get shipped with the next regular packet updates or latest with UCS-4.5 / UCS-5.0 when all packages will get bumped and re-compiled anyway.
OK: the spelling mistakes so far