Small changes based on IRC discuss

This commit is contained in:
Marc 2015-04-16 15:15:10 +02:00
parent a4f4fa96c0
commit ea8690235a

View File

@ -41,15 +41,7 @@ plugin_additional_data = []
######################################################################################################################## ########################################################################################################################
# I18N setup # Requirements for our application
I18N_MAPPING_FILE = "babel.cfg"
I18N_DOMAIN = "messages"
I18N_INPUT_DIRS = "."
I18N_OUTPUT_DIR_PY = os.path.join(plugin_package, "translations")
I18N_OUTPUT_DIR_JS = os.path.join(plugin_package, "static", "js", "i18n")
I18N_POT_FILE = os.path.join(I18N_OUTPUT_DIR_PY, "messages.pot")
# Requirements for out application
INSTALL_REQUIRES = [ INSTALL_REQUIRES = [
"OctoPrint" "OctoPrint"
] ]
@ -63,6 +55,15 @@ EXTRA_REQUIRES = dict(
] ]
) )
# I18N setup
I18N_MAPPING_FILE = "babel.cfg"
I18N_DOMAIN = "messages"
I18N_INPUT_DIRS = "."
I18N_OUTPUT_DIR_PY = os.path.join(plugin_package, "translations")
I18N_OUTPUT_DIR_JS = os.path.join(plugin_package, "static", "js", "i18n")
I18N_POT_FILE = os.path.join(I18N_OUTPUT_DIR_PY, "messages.pot")
def package_data_dirs(source, sub_folders): def package_data_dirs(source, sub_folders):
import os import os
dirs = [] dirs = []
@ -316,12 +317,6 @@ def params():
install_requires = INSTALL_REQUIRES install_requires = INSTALL_REQUIRES
extras_require = EXTRA_REQUIRES extras_require = EXTRA_REQUIRES
if os.environ.get('READTHEDOCS', None) == 'True':
# we can't tell read the docs to please perform a pip install -e .[develop], so we help
# it a bit here by explicitly adding the development dependencies, which include our
# documentation dependencies
install_requires = install_requires + extras_require['develop']
# Hook the plugin into the "octoprint.plugin" entry point, mapping the plugin_identifier to the plugin_package. # Hook the plugin into the "octoprint.plugin" entry point, mapping the plugin_identifier to the plugin_package.
# That way OctoPrint will be able to find the plugin and load it. # That way OctoPrint will be able to find the plugin and load it.
entry_points = { entry_points = {