Edgewall Software
Modify

Opened 6 years ago

Closed 5 years ago

Last modified 5 years ago

#13084 closed enhancement (fixed)

Suggestions for on-screen parlance

Reported by: figaro Owned by: figaro
Priority: normal Milestone: 1.3.4
Component: general Version: 1.3dev
Severity: normal Keywords:
Cc: Branch:
Release Notes:
API Changes:
Internal Changes:

Description (last modified by Jun Omae)

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 fileAssociated 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

Attachments (22)

default-pages.Notification.diff (5.7 KB ) - added by figaro 6 years ago.
File trac/wiki/default-pages/TracNotification
env.diff (4.9 KB ) - added by figaro 6 years ago.
File trac/env.py
mysql_backend.diff (2.8 KB ) - added by figaro 6 years ago.
File trac/db/mysql_backend.py
notification.api.diff (1.1 KB ) - added by figaro 6 years ago.
File trac/notification/api.py
notification.mail.diff (2.0 KB ) - added by figaro 6 years ago.
File trac/notification/mail.py
postgres_backend.diff (2.5 KB ) - added by figaro 6 years ago.
File trac/db/postgres_backend.py
sqlite_backend.diff (1.2 KB ) - added by figaro 6 years ago.
File trac/db/sqlite_backend.py
templates.attachment.diff (414 bytes ) - added by figaro 6 years ago.
File trac/templates/attachment.html
templates.genshi.attachment.diff (695 bytes ) - added by figaro 6 years ago.
File trac/templates/genshi/attachment.html
ticket.api.diff (651 bytes ) - added by figaro 6 years ago.
File trac/ticket/api.py
ticket.notification.diff (2.0 KB ) - added by figaro 6 years ago.
File trac/ticket/notification.py
ticket.roadmap.diff (2.3 KB ) - added by figaro 6 years ago.
File trac/ticket/roadmap.py
ticket.templates.ticket.diff (745 bytes ) - added by figaro 6 years ago.
File trac/ticket/templates/ticket.html
ticket.tests.notification.diff (2.6 KB ) - added by figaro 6 years ago.
trac/trac/ticket/tests/notification.py
trac_db_api.diff (393 bytes ) - added by figaro 6 years ago.
File doc/api/trac_db_api.rst
util.init.diff (647 bytes ) - added by figaro 6 years ago.
File trac/util/init.py
util.text.diff (658 bytes ) - added by figaro 6 years ago.
File trac/util/text.py
versioncontrol.api.diff (411 bytes ) - added by figaro 6 years ago.
File trac/versioncontrol/api.py
web.auth.diff (888 bytes ) - added by figaro 6 years ago.
File trac/web/auth.py
web.chrome.diff (3.7 KB ) - added by figaro 6 years ago.
File trac/web/chrome.py
web.main.diff (1.2 KB ) - added by figaro 6 years ago.
File trac/web/main.py
wiki.formatter.diff (368 bytes ) - added by figaro 6 years ago.
File trac/wiki/formatter.py

Download all attachments as: .zip

Change History (28)

by figaro, 6 years ago

File trac/wiki/default-pages/TracNotification

by figaro, 6 years ago

Attachment: env.diff added

File trac/env.py

by figaro, 6 years ago

Attachment: mysql_backend.diff added

File trac/db/mysql_backend.py

by figaro, 6 years ago

Attachment: notification.api.diff added

File trac/notification/api.py

by figaro, 6 years ago

Attachment: notification.mail.diff added

File trac/notification/mail.py

by figaro, 6 years ago

Attachment: postgres_backend.diff added

File trac/db/postgres_backend.py

by figaro, 6 years ago

Attachment: sqlite_backend.diff added

File trac/db/sqlite_backend.py

by figaro, 6 years ago

Attachment: templates.attachment.diff added

File trac/templates/attachment.html

by figaro, 6 years ago

File trac/templates/genshi/attachment.html

by figaro, 6 years ago

Attachment: ticket.api.diff added

File trac/ticket/api.py

by figaro, 6 years ago

Attachment: ticket.notification.diff added

File trac/ticket/notification.py

by figaro, 6 years ago

Attachment: ticket.roadmap.diff added

File trac/ticket/roadmap.py

by figaro, 6 years ago

File trac/ticket/templates/ticket.html

by figaro, 6 years ago

trac/trac/ticket/tests/notification.py

by figaro, 6 years ago

Attachment: trac_db_api.diff added

File doc/api/trac_db_api.rst

by figaro, 6 years ago

Attachment: util.init.diff added

File trac/util/init.py

by figaro, 6 years ago

Attachment: util.text.diff added

File trac/util/text.py

by figaro, 6 years ago

Attachment: versioncontrol.api.diff added

File trac/versioncontrol/api.py

by figaro, 6 years ago

Attachment: web.auth.diff added

File trac/web/auth.py

by figaro, 6 years ago

Attachment: web.chrome.diff added

File trac/web/chrome.py

by figaro, 6 years ago

Attachment: web.main.diff added

File trac/web/main.py

by figaro, 6 years ago

Attachment: wiki.formatter.diff added

File trac/wiki/formatter.py

comment:1 by Jun Omae, 6 years ago

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)))
    

comment:2 by Jun Omae, 6 years ago

Description: modified (diff)

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

comment:3 by Ryan J Ollos, 6 years ago

  • 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.

comment:4 by figaro, 6 years ago

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

comment:5 by Ryan J Ollos, 5 years ago

Milestone: 1.3.4
Resolution: fixed
Status: newclosed

Committed some of the changes in r16940.

comment:6 by Ryan J Ollos, 5 years ago

Owner: set to figaro

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain figaro.
The resolution will be deleted. Next status will be 'reopened'.
to The owner will be changed from figaro to the specified user.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.