Suggestions for on-screen parlance

[figaro]

Some of the on-screen parlance can be improved, for example:

• from DB to database
• from e-mail to email
• other cosmetic and syntactical suggestions, both on-screen and in code

Diff files pertain to the Trac files as follows:

Trac file	Associated diff file
trac/doc/api/trac_db_api.rst	trac_db_api.diff
trac/trac/db/mysql_backend.py	mysql_backend.diff
trac/trac/db/postgres_backend.py	postgres_backend.diff
trac/trac/db/sqlite_backend.py	sqlite_backend.diff
trac/trac/env.py	env.diff
trac/trac/notification/api.py	notification.api.diff
trac/trac/notification/mail.py	notification.mail.diff
trac/trac/templates/attachment.html	templates.attachment.diff
trac/trac/templates/genshi/attachment.html	templates.genshi.attachment.diff
trac/trac/ticket/api.py	ticket.api.diff
trac/trac/ticket/notification.py	ticket.notification.diff
trac/trac/ticket/roadmap.py	ticket.roadmap.diff
trac/trac/ticket/templates/ticket.html	ticket.templates.ticket.diff
trac/trac/ticket/tests/notification.py	ticket.tests.notification.diff
trac/trac/util/__init__.py	util.init.diff
trac/trac/util/text.py	util.text.diff
trac/trac/versioncontrol/api.py	versioncontrol.api.diff
trac/trac/web/auth.py	web.auth.diff
trac/trac/web/chrome.py	web.chrome.diff
trac/trac/web/main.py	web.main.diff
trac/trac/wiki/default-pages/TracNotification	default-pages.Notification.diff
trac/trac/wiki/formatter.py	wiki.formatter.diff
trac/trac/wiki/templates/wiki_edit_form.html	wiki.templates.wiki_edit_form.diff

[figaro]

File trac/wiki/default-pages/TracNotification

[figaro]

File trac/env.py

[figaro]

File trac/db/mysql_backend.py

[figaro]

File trac/notification/api.py

[figaro]

File trac/notification/mail.py

[figaro]

File trac/db/postgres_backend.py

[figaro]

File trac/db/sqlite_backend.py

[figaro]

File trac/templates/attachment.html

[figaro]

File trac/templates/genshi/attachment.html

[figaro]

File trac/ticket/api.py

[figaro]

File trac/ticket/notification.py

[figaro]

File trac/ticket/roadmap.py

[figaro]

File trac/ticket/templates/ticket.html

[figaro]

trac/trac/ticket/tests/notification.py

[figaro]

File doc/api/trac_db_api.rst

[figaro]

File trac/util/init.py

[figaro]

File trac/util/text.py

[figaro]

File trac/versioncontrol/api.py

[figaro]

File trac/web/auth.py

[figaro]

File trac/web/chrome.py

[figaro]

File trac/web/main.py

[figaro]

File trac/wiki/formatter.py

[Jun Omae]

Please use your fork of ​https://github.com/edgewall/trac to improve with large and/or many changes. Also, wiki.templates.wiki_edit_form.diff is missing.

---

1. We should keep SQL queries in *.py files if no reasons and no coding-style.

   @@ -470,7 +470,7 @@ class MySQLConnection(ConnectionBase, ConnectionWrapper):
        def get_column_names(self, table):
            rows = self.execute("""
                SELECT column_name FROM information_schema.columns
   -            WHERE table_schema=%s AND table_name=%s
   +            WHERE table_schema = %s AND table_name = %s
                ORDER BY ordinal_position
                """, (self.schema, table))
            return [row[0] for row in rows]
   

2. It is intentional that psycopg2>=2.0 as requirement-specifiers has no spaces.

   @@ -38,7 +38,7 @@ try:
        from psycopg2.extensions import register_type, UNICODE, \
                                        register_adapter, AsIs, QuotedString
    except ImportError:
   -    raise DistributionNotFound('psycopg2>=2.0 or psycopg2-binary', ['Trac'])
   +    raise DistributionNotFound('psycopg2 >= 2.0 or psycopg2-binary', ['Trac'])
    else:
        register_type(UNICODE)
        register_adapter(Markup, lambda markup: QuotedString(unicode(markup)))
   

[Jun Omae]

Branch log:jomae.git@t13084 is temporarily created with the attached patches.

[Ryan J Ollos]

• Changes to default wiki pages (e.g. trac/wiki/default-pages/TracNotification) should be made on the t.e.o wiki. They are sync'ed with every release.
• I agree with the change to trac/doc/api/trac_db_api.rst and URL in trac/db/sqlite_backend.py.
• There are some grammar fixes in comments that would also be fine.
• I agree that SQL should not be changed, per comment:1.
• Translatable strings should not have trivial changes, as it causes work for translators.
• E-mail vs email and DB vs database are personal preference and I won't be spending my time making trivial changes like this in the code, though I have no objection if another committer wants to make the changes.

[figaro]

Backing out is about as much work as making them, so I am fine with discarding them all. Apologies for the confusion.

[Ryan J Ollos]

Committed some of the changes in r16940.