Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #1481

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
c9ac373
spelling: absolute
jsoref Mar 18, 2025
df5e431
spelling: accepts
jsoref Mar 18, 2025
d979b26
spelling: applied
jsoref Mar 18, 2025
74724f6
spelling: appropriate
jsoref Mar 18, 2025
f69e133
spelling: cannot
jsoref Mar 18, 2025
0b113a3
spelling: case-insensitive
jsoref Mar 18, 2025
d294bbe
spelling: cherrypy
jsoref Mar 18, 2025
15a91d9
spelling: children
jsoref Mar 18, 2025
3f67bf1
spelling: circuit
jsoref Mar 18, 2025
3354072
spelling: comment
jsoref Mar 18, 2025
59dcd76
spelling: compatible
jsoref Mar 18, 2025
1a111a8
spelling: course
jsoref Mar 18, 2025
eeb8f9b
spelling: course,
jsoref Mar 18, 2025
6398e1c
spelling: dedent
jsoref Mar 18, 2025
aa7d455
spelling: defined
jsoref Mar 18, 2025
626c6ef
spelling: deprecated
jsoref Mar 18, 2025
8aff320
spelling: deprecation
jsoref Mar 18, 2025
77e9ac5
spelling: direct
jsoref Mar 18, 2025
cef2423
spelling: doesn't
jsoref Mar 18, 2025
3663198
spelling: equals
jsoref Mar 18, 2025
0dcf9c2
spelling: executed
jsoref Mar 18, 2025
91da06b
spelling: form
jsoref Mar 18, 2025
8085d82
spelling: forms
jsoref Mar 18, 2025
4d53296
spelling: github
jsoref Mar 18, 2025
86ce981
spelling: infastructure
jsoref Mar 18, 2025
02e0296
spelling: inheritance
jsoref Mar 18, 2025
23de7b4
spelling: into
jsoref Mar 18, 2025
fd1d573
spelling: loosely
jsoref Mar 18, 2025
7e0ace5
spelling: macos
jsoref Mar 18, 2025
592b991
spelling: modifying
jsoref Mar 18, 2025
2abaf82
spelling: module
jsoref Mar 18, 2025
fa42707
spelling: multipart
jsoref Mar 18, 2025
1aec4df
spelling: multiple
jsoref Mar 18, 2025
2a72e10
spelling: nonexistent
jsoref Mar 18, 2025
d1f0dd1
spelling: order
jsoref Mar 18, 2025
4f69b6d
spelling: parameter
jsoref Mar 18, 2025
7dc91b7
spelling: powers
jsoref Mar 18, 2025
6ed4b96
spelling: practice
jsoref Mar 18, 2025
9f09ac7
spelling: python
jsoref Mar 18, 2025
557290d
spelling: recipes
jsoref Mar 18, 2025
f6daaa2
spelling: relative
jsoref Mar 18, 2025
a964dc2
spelling: returns
jsoref Mar 18, 2025
fcfd18e
spelling: scheme
jsoref Mar 18, 2025
daef265
spelling: similar
jsoref Mar 18, 2025
6bb6ce7
spelling: strings
jsoref Mar 18, 2025
ee23087
spelling: template
jsoref Mar 18, 2025
8faa353
spelling: terminating
jsoref Mar 18, 2025
4b2e1b8
spelling: the
jsoref Mar 18, 2025
e7bb699
spelling: transifex
jsoref Mar 18, 2025
3fc1d3b
spelling: ubuntu's
jsoref Mar 18, 2025
feeb191
spelling: utilizing
jsoref Mar 18, 2025
19decb3
spelling: validation
jsoref Mar 18, 2025
31b4dca
spelling: when dealing
jsoref Mar 18, 2025
a16a640
spelling: whitespace
jsoref Mar 18, 2025
ba91a87
Drop excess `#`
jsoref Mar 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions bottle.py
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ def _cli_patch(cli_args): # pragma: no coverage
_cli_patch(sys.argv)

###############################################################################
# Imports and Helpers used everywhere else #####################################
# Imports and Helpers used everywhere else ####################################
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't really a spelling change. I noticed it when I looked at the file (I'm considering using this project for a task...)

###############################################################################

import base64, calendar, email.utils, functools, hmac, itertools, \
@@ -226,7 +226,7 @@ class BottleException(Exception):
pass

###############################################################################
# Routing ######################################################################
# Routing #####################################################################
###############################################################################


@@ -564,7 +564,7 @@ def __repr__(self):
return '<%s %s -> %s:%s>' % (self.method, self.rule, cb.__module__, cb.__name__)

###############################################################################
# Application Object ###########################################################
# Application Object ##########################################################
###############################################################################


@@ -738,7 +738,7 @@ def mount(self, prefix, app, **options):
application, install them separately.

While it is possible to use path wildcards within the prefix path
(:class:`Bottle` childs only), it is highly discouraged.
(:class:`Bottle` children only), it is highly discouraged.

The prefix path must end with a slash. If you want to access the
root of the child application via `/prefix` in addition to
@@ -1089,7 +1089,7 @@ def __setattr__(self, name, value):
object.__setattr__(self, name, value)

###############################################################################
# HTTP and WSGI Tools ##########################################################
# HTTP and WSGI Tools #########################################################
###############################################################################


@@ -1895,7 +1895,7 @@ class LocalResponse(BaseResponse):

class HTTPResponse(Response, BottleException):
""" A subclass of :class:`Response` that can be raised or returned from request
handlers to short-curcuit request processing and override changes made to the
handlers to short-circuit request processing and override changes made to the
global :data:`request` object. This bypasses error handlers, even if the status
code indicates an error. Return or raise :class:`HTTPError` to trigger error
handlers.
@@ -1928,7 +1928,7 @@ def __init__(self,
super(HTTPError, self).__init__(body, status, **more_headers)

###############################################################################
# Plugins ######################################################################
# Plugins #####################################################################
###############################################################################


@@ -2044,7 +2044,7 @@ def load_module(self, fullname):
return module

###############################################################################
# Common Utilities #############################################################
# Common Utilities ############################################################
###############################################################################


@@ -2448,7 +2448,7 @@ def _make_overlay(self):
share the same meta entries.

Entries that were copied from the source are called 'virtual'. You
can not delete virtual keys, but overwrite them, which turns them
cannot delete virtual keys, but overwrite them, which turns them
into non-virtual entries. Setting keys on an overlay never affects
its source, but may affect any number of child overlays.

@@ -2684,7 +2684,7 @@ def save(self, destination, overwrite=False, chunk_size=2 ** 16):
self._copy_file(destination, chunk_size)

###############################################################################
# Application Helper ###########################################################
# Application Helper ##########################################################
###############################################################################


@@ -2826,7 +2826,7 @@ def static_file(filename, root,
return HTTPResponse(body, **headers)

###############################################################################
# HTTP Utilities and MISC (TODO) ###############################################
# HTTP Utilities and MISC (TODO) ##############################################
###############################################################################


@@ -3092,7 +3092,7 @@ def wrapper(*a, **ka):


###############################################################################
# Multipart Handling ###########################################################
# Multipart Handling ##########################################################
###############################################################################
# cgi.FieldStorage was deprecated in Python 3.11 and removed in 3.13
# This implementation is based on https://github.com/defnull/multipart/
@@ -3184,7 +3184,7 @@ def parse(self):
else:
raise MultipartError("Stream does not contain boundary")

# First line is termainating boundary -> empty multipart stream
# First line is terminating boundary -> empty multipart stream
if line == terminator:
for _ in lines:
raise MultipartError("Found data after empty multipart stream")
@@ -3339,7 +3339,7 @@ def close(self):
self.file = False

###############################################################################
# Server Adapter ###############################################################
# Server Adapter ##############################################################
###############################################################################

# Before you edit or add a server adapter, please read:
@@ -3726,7 +3726,7 @@ def run(self, handler):
}

###############################################################################
# Application Control ##########################################################
# Application Control #########################################################
###############################################################################


@@ -3919,7 +3919,7 @@ def __exit__(self, exc_type, *_):
return exc_type is not None and issubclass(exc_type, KeyboardInterrupt)

###############################################################################
# Template Adapters ############################################################
# Template Adapters ###########################################################
###############################################################################


@@ -4419,7 +4419,7 @@ def wrapper(*args, **kwargs):
jinja2_view = functools.partial(view, template_adapter=Jinja2Template)

###############################################################################
# Constants and Globals ########################################################
# Constants and Globals #######################################################
###############################################################################

TEMPLATE_PATH = ['./', './views/']
4 changes: 2 additions & 2 deletions docs/_locale/README.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Translation Workflow
====================

If documentation changed, run `make push` to push new messages to transiflex (manager account required).
If documentation changed, run `make push` to push new messages to transifex (manager account required).

To update the local translation files, call `make pull` and commit the changes from time to time (manager account required).

Go to https://www.transifex.com/bottle for actually translating stuff. You can du that with a normal user account at transiflex.
Go to https://www.transifex.com/bottle for actually translating stuff. You can du that with a normal user account at transifex.
4 changes: 2 additions & 2 deletions docs/_locale/_pot/api.pot
Original file line number Diff line number Diff line change
@@ -394,7 +394,7 @@ msgid "Current value of the 'Content-Length' header."
msgstr ""

#: ../../../bottle.py:docstring of bottle.FileUpload.get_header:1
msgid "Return the value of a header within the mulripart part."
msgid "Return the value of a header within the multipart part."
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually avoid touching localizations/pot files, but for this project, I decided to include the changes. It's trivial for me to drop changes to files, I just need to know which...

msgstr ""

#: ../../../bottle.py:docstring of bottle.FileUpload.filename:1
@@ -510,7 +510,7 @@ msgid "Plugins from the parent application are not applied to the routes of the
msgstr ""

#: ../../../bottle.py:docstring of bottle.Bottle.mount:13
msgid "While it is possible to use path wildcards within the prefix path (:class:`Bottle` childs only), it is highly discouraged."
msgid "While it is possible to use path wildcards within the prefix path (:class:`Bottle` children only), it is highly discouraged."
msgstr ""

#: ../../../bottle.py:docstring of bottle.Bottle.mount:16
2 changes: 1 addition & 1 deletion docs/_locale/_pot/changelog.pot
Original file line number Diff line number Diff line change
@@ -369,7 +369,7 @@ msgid ":meth:`Bottle.mount` parameter order changed."
msgstr ""

#: ../../changelog.rst:147
msgid ":meth:`Bottle.route` now accpets an import string for the ``callback`` parameter."
msgid ":meth:`Bottle.route` now accepts an import string for the ``callback`` parameter."
msgstr ""

#: ../../changelog.rst:148
2 changes: 1 addition & 1 deletion docs/_locale/_pot/configuration.pot
Original file line number Diff line number Diff line change
@@ -157,7 +157,7 @@ msgid "Load values from a Python module."
msgstr ""

#: ../../../bottle.py:docstring of bottle.ConfigDict.load_module:3
msgid "Example modue ``config.py``::"
msgid "Example module ``config.py``::"
msgstr ""

#: ../../../bottle.py:docstring of bottle.ConfigDict.load_module:0
2 changes: 1 addition & 1 deletion docs/_locale/_pot/deployment.pot
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@ msgid "waitress_"
msgstr ""

#: ../../deployment.rst:69
msgid "Multi-threaded, poweres Pyramid"
msgid "Multi-threaded, powers Pyramid"
msgstr ""

#: ../../deployment.rst:70
4 changes: 2 additions & 2 deletions docs/_locale/_pot/development.pot
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ msgid "Minor Release (x.y)"
msgstr ""

#: ../../development.rst:40
msgid "The minor release number is increased on updates that change the API or behaviour in some way. You might get some depreciation warnings any may have to tweak some configuration settings to restore the old behaviour, but in most cases these changes are designed to be backward compatible for at least one minor release. You should update to stay up do date, but don't have to. An exception is 0.8, which *will* break backward compatibility hard. (This is why 0.7 was skipped). Sorry about that."
msgid "The minor release number is increased on updates that change the API or behaviour in some way. You might get some deprecation warnings any may have to tweak some configuration settings to restore the old behaviour, but in most cases these changes are designed to be backward compatible for at least one minor release. You should update to stay up do date, but don't have to. An exception is 0.8, which *will* break backward compatibility hard. (This is why 0.7 was skipped). Sorry about that."
msgstr ""

#: ../../development.rst:43
@@ -185,7 +185,7 @@ msgid "**Test:** Write tests to prove that your code works as expected and does
msgstr ""

#: ../../development.rst:83
msgid "**One patch at a time:** Only fix one bug or add one feature at a time. Design your patches so that they can be applyed as a whole. Keep your patches clean, small and focused."
msgid "**One patch at a time:** Only fix one bug or add one feature at a time. Design your patches so that they can be applied as a whole. Keep your patches clean, small and focused."
msgstr ""

#: ../../development.rst:84
2 changes: 1 addition & 1 deletion docs/_locale/_pot/faq.pot
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ msgid "Dynamic Routes and Slashes"
msgstr ""

#: ../../faq.rst:40
msgid "In :ref:`dynamic route syntax <tutorial-dynamic-routes>`, a placeholder token (``<name>``) matches everything up to the next slash. This equals to ``[^/]+`` in regular expression syntax. To accept slashes too, you have to add a custom regular pattern to the placeholder. An example: ``/images/<filepath:path>`` would match ``/images/icons/error.png`` but ``/images/<filename>`` won't."
msgid "In :ref:`dynamic route syntax <tutorial-dynamic-routes>`, a placeholder token (``<name>``) matches everything up to the next slash. This equals ``[^/]+`` in regular expression syntax. To accept slashes too, you have to add a custom regular pattern to the placeholder. An example: ``/images/<filepath:path>`` would match ``/images/icons/error.png`` but ``/images/<filename>`` won't."
msgstr ""

#: ../../faq.rst:43
2 changes: 1 addition & 1 deletion docs/_locale/_pot/recipes.pot
Original file line number Diff line number Diff line change
@@ -214,7 +214,7 @@ msgid "Using Bottle with Heroku"
msgstr ""

#: ../../recipes.rst:263
msgid "Heroku_, a popular cloud application platform now provides support for running Python applications on their infastructure."
msgid "Heroku_, a popular cloud application platform now provides support for running Python applications on their infrastructure."
msgstr ""

#: ../../recipes.rst:266
2 changes: 1 addition & 1 deletion docs/_locale/_pot/tutorial_app.pot
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ msgid "Further Software Necessities"
msgstr ""

#: ../../tutorial_app.rst:63
msgid "As we use SQLite3 as a database, make sure it is installed. On Linux systems, most distributions have SQLite3 installed by default. SQLite is available for Windows and MacOS X as well and the `sqlite3` module is part of the python standard library."
msgid "As we use SQLite3 as a database, make sure it is installed. On Linux systems, most distributions have SQLite3 installed by default. SQLite is available for Windows and macOS as well and the `sqlite3` module is part of the python standard library."
msgstr ""

#: ../../tutorial_app.rst:66
4 changes: 2 additions & 2 deletions docs/_locale/de_DE/LC_MESSAGES/api.po
Original file line number Diff line number Diff line change
@@ -480,7 +480,7 @@ msgid "Current value of the 'Content-Length' header."
msgstr ""

#: ../../../bottle.pydocstring of bottle.FileUpload.get_header:1
msgid "Return the value of a header within the mulripart part."
msgid "Return the value of a header within the multipart part."
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My logic for updating translations is that the translator has either picked a translation or hasn't gotten around to it, and in either case fixing a typo isn't material.

If there's a sign that the translation was misguided based on the typo, then I wouldn't update a key.

msgstr ""

#: ../../../bottle.pydocstring of bottle.FileUpload.filename:1
@@ -621,7 +621,7 @@ msgstr ""
#: ../../../bottle.pydocstring of bottle.Bottle.mount:13
msgid ""
"While it is possible to use path wildcards within the prefix path "
"(:class:`Bottle` childs only), it is highly discouraged."
"(:class:`Bottle` children only), it is highly discouraged."
msgstr ""

#: ../../../bottle.pydocstring of bottle.Bottle.mount:16
2 changes: 1 addition & 1 deletion docs/_locale/de_DE/LC_MESSAGES/changelog.po
Original file line number Diff line number Diff line change
@@ -495,7 +495,7 @@ msgstr ""

#: ../../changelog.rst:147
msgid ""
":meth:`Bottle.route` now accpets an import string for the ``callback`` "
":meth:`Bottle.route` now accepts an import string for the ``callback`` "
"parameter."
msgstr ""

2 changes: 1 addition & 1 deletion docs/_locale/de_DE/LC_MESSAGES/configuration.po
Original file line number Diff line number Diff line change
@@ -223,7 +223,7 @@ msgid "Load values from a Python module."
msgstr ""

#: ../../../bottle.pydocstring of bottle.ConfigDict.load_module:3
msgid "Example modue ``config.py``::"
msgid "Example module ``config.py``::"
msgstr ""

#: ../../../bottle.pydocstring of bottle.ConfigDict.load_module:0
2 changes: 1 addition & 1 deletion docs/_locale/de_DE/LC_MESSAGES/deployment.po
Original file line number Diff line number Diff line change
@@ -201,7 +201,7 @@ msgid "waitress_"
msgstr ""

#: ../../deployment.rst:69
msgid "Multi-threaded, poweres Pyramid"
msgid "Multi-threaded, powers Pyramid"
msgstr ""

#: ../../deployment.rst:70
10 changes: 5 additions & 5 deletions docs/_locale/de_DE/LC_MESSAGES/development.po
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ msgid ""
" in at least the two latest minor releases and announced in all available "
"channels (mailinglist, twitter, github). Non-critical bugs or features are "
"not guaranteed to be backported. This may change in the future, through."
msgstr "Die Bottle Versionsnummer ist in drei Teile unterteilt (**major.minor.revision**). Diese werden *nicht* dazu genutzt um neue Funktionen zu bewerben, sondern um wichtige bug-fixes und/oder Änderungen an der API zu indizieren. Kritische Fehler werden in den letzten zwei stabilen Veröffentlichungen behoben und über alle Kanäle mitgeteilt (Mailinglisten, Twitter, Github). Nicht kritische Fehler oder Features werden garantiert zurückgestellt. Dies wird sich eventuell in der Zukunft ändern. "
msgstr "Die Bottle Versionsnummer ist in drei Teile unterteilt (**major.minor.revision**). Diese werden *nicht* dazu genutzt um neue Funktionen zu bewerben, sondern um wichtige bug-fixes und/oder Änderungen an der API zu indizieren. Kritische Fehler werden in den letzten zwei stabilen Veröffentlichungen behoben und über alle Kanäle mitgeteilt (Mailinglisten, Twitter, GitHub). Nicht kritische Fehler oder Features werden garantiert zurückgestellt. Dies wird sich eventuell in der Zukunft ändern. "
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is different. I believe the correct thing is for someone to go into transifex and fix the translation, but I don't have the resources to do that for random projects.


#: ../../development.rst:37
msgid "Major Release (x.0)"
@@ -283,7 +283,7 @@ msgstr "**Test:** Schreibe Tests um nachzuweisen dass dein Code wie geplant funk
#: ../../development.rst:83
msgid ""
"**One patch at a time:** Only fix one bug or add one feature at a time. "
"Design your patches so that they can be applyed as a whole. Keep your "
"Design your patches so that they can be applied as a whole. Keep your "
"patches clean, small and focused."
msgstr "**Ein Patch zur selben Zeit:** Behebe nur einen Fehler oder füge nur ein Feature zur selben Zeit hinzu. Entwickle deine Patches so, dass sie als Ganzes angewendet werden können. Halte deine Patches sauber, klein und fokussiert."

@@ -314,7 +314,7 @@ msgid ""
"The following examples assume that you have an (free) `github account "
"<https://github.com>`_. This is not mandatory, but makes things a lot "
"easier."
msgstr "Die folgenden Beispiele nehmen an dass du einen (kostnelosen) `Github Account <https://github.com>`_ besitzt. Dies ist nicht notwendig, erleichtert die Dinge jedoch sehr."
msgstr "Die folgenden Beispiele nehmen an dass du einen (kostnelosen) `GitHub Account <https://github.com>`_ besitzt. Dies ist nicht notwendig, erleichtert die Dinge jedoch sehr."

#: ../../development.rst:125
msgid ""
@@ -386,7 +386,7 @@ msgstr "Dies ist gleichbedeutend mit der Rückgängigmachung all deiner Änderun
msgid ""
"Now you are almost ready to send a pull request. But first you need to make "
"your feature-branch public by pushing it to your github fork::"
msgstr "Jetzt bist du beinahe bereit ein pull-request zu senden. Aber als ersten muss du deinen Feature-Branch öffentlich machen indem du ihn in deine Github-Fork pushst. "
msgstr "Jetzt bist du beinahe bereit ein pull-request zu senden. Aber als ersten muss du deinen Feature-Branch öffentlich machen indem du ihn in deine GitHub-Fork pushst. "

#: ../../development.rst:160
msgid ""
@@ -395,7 +395,7 @@ msgid ""
"be to start a thread in the mailing-list, which is recommended. It allows "
"other developers to see and discuss your patches and you get some feedback "
"for free :)"
msgstr "Nachdem du deinen commit gepusht hast musst du uns über das neue Feature informieren. Eine Möglichkeit ist, ein pull-request über Github zu senden. Eine Andere wäre, einen neuen Thread in der Mailingliste zu starten, was empfohlen wird. Es erlaubt anderen Entwicklern deine Patches zu sehen und zu diskutieren und du bekommst gratis Feedback :)"
msgstr "Nachdem du deinen commit gepusht hast musst du uns über das neue Feature informieren. Eine Möglichkeit ist, ein pull-request über GitHub zu senden. Eine Andere wäre, einen neuen Thread in der Mailingliste zu starten, was empfohlen wird. Es erlaubt anderen Entwicklern deine Patches zu sehen und zu diskutieren und du bekommst gratis Feedback :)"

#: ../../development.rst:162
msgid ""
2 changes: 1 addition & 1 deletion docs/_locale/de_DE/LC_MESSAGES/faq.po
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ msgstr "Dynamische Routen und Schrägstriche"
#: ../../faq.rst:40
msgid ""
"In :ref:`dynamic route syntax <tutorial-dynamic-routes>`, a placeholder "
"token (``<name>``) matches everything up to the next slash. This equals to "
"token (``<name>``) matches everything up to the next slash. This equals "
"``[^/]+`` in regular expression syntax. To accept slashes too, you have to "
"add a custom regular pattern to the placeholder. An example: "
"``/images/<filepath:path>`` would match ``/images/icons/error.png`` but "
2 changes: 1 addition & 1 deletion docs/_locale/de_DE/LC_MESSAGES/recipes.po
Original file line number Diff line number Diff line change
@@ -288,7 +288,7 @@ msgstr ""
#: ../../recipes.rst:263
msgid ""
"Heroku_, a popular cloud application platform now provides support for "
"running Python applications on their infastructure."
"running Python applications on their infrastructure."
msgstr ""

#: ../../recipes.rst:266
Loading