From 69dec6e83fccdded026c33c35a35aa1c5285ae00 Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Sat, 29 Jul 2017 16:12:08 +0200 Subject: [PATCH] Fix typos in strings and comments Those typos were found with codespell which is available from https://github.com/lucasdemarchi/codespell.git --- docs/events/index.rst | 2 +- docs/jsclientlib/base.rst | 2 +- docs/jsclientlib/util.rst | 2 +- src/octoprint/printer/standard.py | 2 +- src/octoprint/static/js/app/main.js | 10 +++++----- src/octoprint/static/js/app/viewmodels/slicing.js | 2 +- src/octoprint/static/js/app/viewmodels/system.js | 2 +- src/octoprint/templates/tabs/terminal.jinja2 | 2 +- src/octoprint/util/__init__.py | 2 +- src/octoprint/util/comm.py | 4 ++-- src/octoprint_client/__init__.py | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/events/index.rst b/docs/events/index.rst index 225331f5..4e675c8f 100644 --- a/docs/events/index.rst +++ b/docs/events/index.rst @@ -237,7 +237,7 @@ UpdatedFiles .. deprecated:: 1.2.0 - The ``gcode`` modification type has been superceeded by ``printables``. It is currently still available for + The ``gcode`` modification type has been superseded by ``printables``. It is currently still available for reasons of backwards compatibility and will also be sent on modification of ``printables``. It will however be removed with 1.4.0. diff --git a/docs/jsclientlib/base.rst b/docs/jsclientlib/base.rst index d393f27e..618299fd 100644 --- a/docs/jsclientlib/base.rst +++ b/docs/jsclientlib/base.rst @@ -119,7 +119,7 @@ :param string method: The HTTP method to use for the request (optional) :param string url: The URL to perform the request against (optional) :param object data: The data to send in the request body (optional) - :param object opts: Additonal options to use for the request (optional) + :param object opts: Additional options to use for the request (optional) :returns Promise: A `jQuery Promise `_ for the request's response .. js:function:: OctoPrintClient.get(url, opts) diff --git a/docs/jsclientlib/util.rst b/docs/jsclientlib/util.rst index 6168e1af..74b10cbe 100644 --- a/docs/jsclientlib/util.rst +++ b/docs/jsclientlib/util.rst @@ -21,7 +21,7 @@ .. js:function:: OctoPrintClient.util.testPath(path, additional, opts) - Test the provided ``path`` for existance. More test criteria supported by the :ref:`path test command ` + Test the provided ``path`` for existence. More test criteria supported by the :ref:`path test command ` can be provided via the ``additional`` object. **Example 1** diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py index 873dfec2..184bb564 100644 --- a/src/octoprint/printer/standard.py +++ b/src/octoprint/printer/standard.py @@ -958,7 +958,7 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback): }) callback.on_printer_send_initial_data(data) except: - self._logger.exception("Error while trying to send inital state update") + self._logger.exception("Error while trying to send initial state update") def _getStateFlags(self): return { diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js index 5960bc7b..be684ab6 100644 --- a/src/octoprint/static/js/app/main.js +++ b/src/octoprint/static/js/app/main.js @@ -125,7 +125,7 @@ $(function() { return exports; })(); - log.debug("Browser enviroment:", OctoPrint.coreui.browser); + log.debug("Browser environment:", OctoPrint.coreui.browser); //~~ AJAX setup @@ -180,7 +180,7 @@ $(function() { gettext("Printing"), gettext("Paused"), gettext("Closed"), - gettext("Transfering file to SD") + gettext("Transferring file to SD") ]; //~~ Initialize PNotify @@ -340,7 +340,7 @@ $(function() { continue; } - // we could resolve the depdendencies and the view model is not defined yet => add it, it's now fully processed + // we could resolve the dependencies and the view model is not defined yet => add it, it's now fully processed var viewModelBindTargets = viewModel.elements; if (additionalBindings.hasOwnProperty(viewModel.name)) { @@ -672,7 +672,7 @@ $(function() { * onServerConnect below takes care of the passive login. Only once that's completed it tells * our DataUpdater that it's ok to trigger any callbacks in view models. On the initial * server connect (during first initialization) we also trigger the settings fetch and - * binding proceedure once that's done, but only then. + * binding procedure once that's done, but only then. * * Or, as a fancy diagram: https://gist.githubusercontent.com/foosel/0cdc3a03cf5311804271f12e87293c0c/raw/abc84fdc3b13030d70961539d9c132ae39c32085/octoprint_web_startup.txt */ @@ -686,7 +686,7 @@ $(function() { // passive login request. // // This is to ensure that we have no concurrent requests triggered by socket events - // overriding each other's session during app intialization + // overriding each other's session during app initialization dataUpdater.initialized(); }); }; diff --git a/src/octoprint/static/js/app/viewmodels/slicing.js b/src/octoprint/static/js/app/viewmodels/slicing.js index d2d47098..a02a6a5e 100644 --- a/src/octoprint/static/js/app/viewmodels/slicing.js +++ b/src/octoprint/static/js/app/viewmodels/slicing.js @@ -15,7 +15,7 @@ $(function() { self.defaultProfile = undefined; self.destinationFilename = ko.observable(); - self.gcodeFilename = self.destinationFilename; // TODO: for backwards compatiblity, mark deprecated ASAP + self.gcodeFilename = self.destinationFilename; // TODO: for backwards compatibility, mark deprecated ASAP self.title = ko.observable(); self.slicer = ko.observable(); diff --git a/src/octoprint/static/js/app/viewmodels/system.js b/src/octoprint/static/js/app/viewmodels/system.js index 6b3002c0..7637c04a 100644 --- a/src/octoprint/static/js/app/viewmodels/system.js +++ b/src/octoprint/static/js/app/viewmodels/system.js @@ -51,7 +51,7 @@ $(function() { if (commandSpec.async) { text = gettext("The command \"%(command)s\" executed successfully"); } else { - text = gettext("The command \"%(command)s\" was triggered asychronously"); + text = gettext("The command \"%(command)s\" was triggered asynchronously"); } new PNotify({ diff --git a/src/octoprint/templates/tabs/terminal.jinja2 b/src/octoprint/templates/tabs/terminal.jinja2 index d86b18f8..ea351e5c 100644 --- a/src/octoprint/templates/tabs/terminal.jinja2 +++ b/src/octoprint/templates/tabs/terminal.jinja2 @@ -27,7 +27,7 @@

- {{ _("If acknowledgements (\"ok\"s) sent by the firmware get lost due to issues with the serial communication to your printer, OctoPrint's communication with it can become stuck. If that happens, this can help. Please be advised that such occurences hint at general communication issues with your printer which will probably negatively influence your printing results and which you should therefore try to resolve!") }} + {{ _("If acknowledgements (\"ok\"s) sent by the firmware get lost due to issues with the serial communication to your printer, OctoPrint's communication with it can become stuck. If that happens, this can help. Please be advised that such occurrences hint at general communication issues with your printer which will probably negatively influence your printing results and which you should therefore try to resolve!") }}

diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py index 950946cf..862347c7 100644 --- a/src/octoprint/util/__init__.py +++ b/src/octoprint/util/__init__.py @@ -2,7 +2,7 @@ from __future__ import absolute_import """ -This module bundles commonly used utility methods or helper classes that are used in multiple places withing +This module bundles commonly used utility methods or helper classes that are used in multiple places within OctoPrint's source code. """ from __future__ import absolute_import, division, print_function diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index cdad5130..b1782f68 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -578,7 +578,7 @@ class MachineCom(object): if state == self.STATE_CLOSED_WITH_ERROR: return "Offline: %s" % (self.getErrorString()) if state == self.STATE_TRANSFERING_FILE: - return "Transfering file to SD" + return "Transferring file to SD" return "Unknown State (%d)" % (self._state) def getErrorString(self): @@ -1953,7 +1953,7 @@ class MachineCom(object): #Also skip errors with the SD card pass elif 'unknown command' in lower_line: - #Ignore unkown command errors, it could be a typo or some missing feature + #Ignore unknown command errors, it could be a typo or some missing feature pass elif not self.isError(): error_text = line[6:] if lower_line.startswith("error:") else line[2:] diff --git a/src/octoprint_client/__init__.py b/src/octoprint_client/__init__.py index 33afec86..49adb561 100644 --- a/src/octoprint_client/__init__.py +++ b/src/octoprint_client/__init__.py @@ -164,7 +164,7 @@ class SocketClient(object): If no timeout is provided, the method will block until the connection could be re-established. - If disconnect is set to ``True`` will disconnect the socket explictly + If disconnect is set to ``True`` will disconnect the socket explicitly first if it is currently connected. Arguments: