From 251a1ea4b544d1b5f7cb883c3be44c0f36e62563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 12 Apr 2017 14:54:32 +0200 Subject: [PATCH] "a couple" => "a few"/"some" Because apparently I was using it wrong, at least for some parts of the world :) --- CONTRIBUTING.md | 2 +- README.md | 2 +- docs/api/datamodel.rst | 2 +- docs/configuration/config_yaml.rst | 4 ++-- docs/features/gcode_scripts.rst | 4 ++-- docs/plugins/gettingstarted.rst | 4 ++-- docs/plugins/helpers.rst | 2 +- src/octoprint/events.py | 2 +- src/octoprint/plugin/__init__.py | 2 +- src/octoprint/plugin/types.py | 6 +++--- src/octoprint/static/js/app/helpers.js | 4 ++-- src/octoprint/templates/dialogs/settings/features.jinja2 | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4e3a4743..f3fb3411 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -380,7 +380,7 @@ Those usually have one of the following prefixes: * `dev/...` or `feature/...`: New functionality under development that is to be merged into the `devel` branch. -There is also the `gh-pages` branch, which holds OctoPrint's web page, and a couple of +There is also the `gh-pages` branch, which holds OctoPrint's web page, and a few older development branches that are slowly being migrated or deleted. ## How OctoPrint is versioned diff --git a/README.md b/README.md index dfe174be..817884a5 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ and at its settings. ## Dependencies -OctoPrint depends on a couple of python modules to do its job. Those are automatically installed when installing +OctoPrint depends on a few python modules to do its job. Those are automatically installed when installing OctoPrint via `setup.py`: python setup.py install diff --git a/docs/api/datamodel.rst b/docs/api/datamodel.rst index 076e7dbe..768e420b 100644 --- a/docs/api/datamodel.rst +++ b/docs/api/datamodel.rst @@ -31,7 +31,7 @@ Printer State * - ``flags`` - 1 - Printer state flags - - A couple of boolean printer state flags + - A few boolean printer state flags * - ``flags.operational`` - 1 - Boolean diff --git a/docs/configuration/config_yaml.rst b/docs/configuration/config_yaml.rst index c48389ae..debb35d1 100644 --- a/docs/configuration/config_yaml.rst +++ b/docs/configuration/config_yaml.rst @@ -943,8 +943,8 @@ Use the following settings to configure the server: * ``X-Scheme``: should contain your custom URL scheme to use (if different from ``http``), e.g. ``https`` If you use these headers OctoPrint will work both via the reverse proxy as well as when called directly. Take a look - `into OctoPrint's wiki `_ for a couple - of examples on how to configure this. + `into OctoPrint's wiki `_ for some + examples on how to configure this. .. _sec-configuration-config_yaml-slicing: diff --git a/docs/features/gcode_scripts.rst b/docs/features/gcode_scripts.rst index e58cfdbc..e19f0199 100644 --- a/docs/features/gcode_scripts.rst +++ b/docs/features/gcode_scripts.rst @@ -15,7 +15,7 @@ on Windows and ``~/Library/Application Support/OctoPrint`` on MacOS). These GCODE scripts are backed by the templating engine `Jinja2 `_, allowing more than just simple "send-as-is" scripts but making use of a full blown templating language in order to create your scripts. To -this end, OctoPrint injects a couple of variables into the :ref:`template rendering context ` +this end, OctoPrint injects some variables into the :ref:`template rendering context ` as described below. .. _sec-features-gcode_scripts-predefined: @@ -64,7 +64,7 @@ All GCODE scripts have access to the following template variables through the te * ``script``: An object wrapping the script's type (``gcode``) and name (e.g. ``afterPrintCancelled``) as ``script.type`` and ``script.name`` respectively. -There are a couple of additional template variables available for the following specific scripts: +There are a few additional template variables available for the following specific scripts: * ``afterPrintPaused`` and ``beforePrintResumed`` diff --git a/docs/plugins/gettingstarted.rst b/docs/plugins/gettingstarted.rst index 57d5e1ca..fe38ab6b 100644 --- a/docs/plugins/gettingstarted.rst +++ b/docs/plugins/gettingstarted.rst @@ -49,7 +49,7 @@ development environment:: by running ``octoprint --version`` or by taking a look into the lower left corner in OctoPrint's web interface. -We'll start at the most basic form a plugin can take - just a couple of simple lines of Python code: +We'll start at the most basic form a plugin can take - just a few simple lines of Python code: .. code-block:: python :linenos: @@ -116,7 +116,7 @@ used :func:`~octoprint.plugin.StartupPlugin.on_startup` instead, in which case o up and ready to serve requests. You'll also note that we are using ``self._logger`` for logging. Where did that one come from? OctoPrint's plugin system -injects :ref:`a couple of useful objects ` into our plugin implementation classes, +injects :ref:`a some useful objects ` into our plugin implementation classes, one of those being a fully instantiated `python logger `_ ready to be used by your plugin. As you can see in the log output above, that logger uses the namespace ``octoprint.plugins.helloworld`` for our little plugin here, or more generally ``octoprint.plugins.``. diff --git a/docs/plugins/helpers.rst b/docs/plugins/helpers.rst index 047811d8..17cd1828 100644 --- a/docs/plugins/helpers.rst +++ b/docs/plugins/helpers.rst @@ -6,7 +6,7 @@ Helpers Helpers are methods that plugin can exposed to other plugins in order to make common functionality available on the system. They are registered with the OctoPrint plugin system through the use of the control property ``__plugin_helpers__``. -An example for providing a couple of helper functions to the system can be found in the +An example for providing some helper functions to the system can be found in the `Discovery Plugin `_, which provides it's SSDP browsing and Zeroconf browsing and publishing functions as helper methods. diff --git a/src/octoprint/events.py b/src/octoprint/events.py index 367fd985..c8630e59 100644 --- a/src/octoprint/events.py +++ b/src/octoprint/events.py @@ -376,7 +376,7 @@ class CommandTrigger(GenericEventListener): def _processCommand(self, command, payload): """ - Performs string substitutions in the command string based on a couple of current parameters. + Performs string substitutions in the command string based on a few current parameters. The following substitutions are currently supported: diff --git a/src/octoprint/plugin/__init__.py b/src/octoprint/plugin/__init__.py index 31367e54..57adfb2e 100644 --- a/src/octoprint/plugin/__init__.py +++ b/src/octoprint/plugin/__init__.py @@ -239,7 +239,7 @@ class PluginSettings(object): """ The :class:`PluginSettings` class is the interface for plugins to their own or globally defined settings. - It provides a couple of convenience methods for directly accessing plugin settings via the regular + It provides some convenience methods for directly accessing plugin settings via the regular :class:`octoprint.settings.Settings` interfaces as well as means to access plugin specific folder locations. All getter and setter methods will ensure that plugin settings are stored in their correct location within the diff --git a/src/octoprint/plugin/types.py b/src/octoprint/plugin/types.py index 2f856e3d..ae54df94 100644 --- a/src/octoprint/plugin/types.py +++ b/src/octoprint/plugin/types.py @@ -531,7 +531,7 @@ class UiPlugin(OctoPrintPlugin, SortablePlugin): provided request by calling :meth:`~octoprint.plugin.UiPlugin.will_handle_ui` with the Flask `Request `_ object as parameter. If you plugin returns `True` here, OctoPrint will next call - :meth:`~octoprint.plugin.UiPlugin.on_ui_render` with a couple of parameters like + :meth:`~octoprint.plugin.UiPlugin.on_ui_render` with a few parameters like - again - the Flask Request object and the render keyword arguments as used by the default OctoPrint web interface. For more information see below. @@ -582,7 +582,7 @@ class UiPlugin(OctoPrintPlugin, SortablePlugin): it only gets re-rendered if the request demands that (by having no-cache headers set) or if the cache gets invalidated otherwise. - In order to be able to do that, the ``UiPlugin`` offers overriding a couple of cache specific + In order to be able to do that, the ``UiPlugin`` offers overriding some cache specific methods used for figuring out the source files whose modification time to use for cache invalidation as well as override possibilities for ETag and LastModified calculation. Additionally there are methods to allow persisting call parameters to allow for preemptively caching your UI during @@ -1038,7 +1038,7 @@ class SimpleApiPlugin(OctoPrintPlugin): mixin offers. Use this mixin if all you need to do is return some kind of dynamic data to your plugin from the backend - and/or want to react to simple commands which boil down to a type of command and a couple of flat parameters + and/or want to react to simple commands which boil down to a type of command and a few flat parameters supplied with it. The simple API constructed by OctoPrint for you will be made available under ``/api/plugin//``. diff --git a/src/octoprint/static/js/app/helpers.js b/src/octoprint/static/js/app/helpers.js index 4e127d8b..98a24d5b 100644 --- a/src/octoprint/static/js/app/helpers.js +++ b/src/octoprint/static/js/app/helpers.js @@ -398,7 +398,7 @@ function formatFuzzyPrintTime(totalSeconds) { * * Accuracy decreases the higher the estimation is: * - * * less than 30s: "a couple of seconds" + * * less than 30s: "a few seconds" * * 30s to a minute: "less than a minute" * * 1 to 30min: rounded to full minutes, above 30s is minute + 1 ("27 minutes", "2 minutes") * * 30min to 40min: "40 minutes" @@ -495,7 +495,7 @@ function formatFuzzyPrintTime(totalSeconds) { } else { // only seconds if (seconds < 30) { - text = gettext("a couple of seconds"); + text = gettext("a few seconds"); } else { text = gettext("less than a minute"); } diff --git a/src/octoprint/templates/dialogs/settings/features.jinja2 b/src/octoprint/templates/dialogs/settings/features.jinja2 index c90bebab..116211f6 100644 --- a/src/octoprint/templates/dialogs/settings/features.jinja2 +++ b/src/octoprint/templates/dialogs/settings/features.jinja2 @@ -46,7 +46,7 @@