diff --git a/python/console/CMakeLists.txt b/python/console/CMakeLists.txt index 57c6b86b858..36eaaec3bfc 100644 --- a/python/console/CMakeLists.txt +++ b/python/console/CMakeLists.txt @@ -1,4 +1,4 @@ -ADD_SUBDIRECTORY(console_help) +ADD_SUBDIRECTORY(help) SET (QGIS_CONSOLE_DIR ${QGIS_DATA_DIR}/python/console) SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python) diff --git a/python/console/console_help.py b/python/console/console_help.py index 93f677c5df6..13c44a6b526 100644 --- a/python/console/console_help.py +++ b/python/console/console_help.py @@ -38,7 +38,7 @@ class HelpDialog(QDialog, Ui_Help): self.setMaximumSize(530, 300) qgisDataDir = QgsApplication.pkgDataPath() - listFile = os.listdir(qgisDataDir + "/python/console/console_help/i18n") + listFile = os.listdir(qgisDataDir + "/python/console/help/i18n") localeFullName = QSettings().value( "locale/userLocale", QVariant( "" ) ).toString() locale = "en_US" for i in listFile: @@ -46,7 +46,7 @@ class HelpDialog(QDialog, Ui_Help): if localeFullName in (lang[0:2], lang): locale = lang - filename = qgisDataDir + "/python/console/console_help/help.htm? \ + filename = qgisDataDir + "/python/console/help/help.htm? \ lang=" + locale \ + "&pkgDir=" + qgisDataDir diff --git a/python/console/console_help/CMakeLists.txt b/python/console/help/CMakeLists.txt similarity index 80% rename from python/console/console_help/CMakeLists.txt rename to python/console/help/CMakeLists.txt index 1ef6389cffe..855218d9399 100644 --- a/python/console/console_help/CMakeLists.txt +++ b/python/console/help/CMakeLists.txt @@ -2,6 +2,6 @@ FILE(GLOB HTML_FILES *.htm) FILE(GLOB I18N_FILES i18n/*.properties) FILE(GLOB JS_FILES js/*.js) -INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help) -INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help/i18n) -INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help/js) +INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/help) +INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/help/i18n) +INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/help/js) diff --git a/python/console/console_help/help.htm b/python/console/help/help.htm similarity index 100% rename from python/console/console_help/help.htm rename to python/console/help/help.htm diff --git a/python/console/console_help/i18n/README b/python/console/help/i18n/README similarity index 80% rename from python/console/console_help/i18n/README rename to python/console/help/i18n/README index c6eb933b97e..ba1f18f8de6 100644 --- a/python/console/console_help/i18n/README +++ b/python/console/help/i18n/README @@ -1,4 +1,4 @@ -You can contribute at translate this help by creating an file *.properties and name it in +You can contribute to translate this help by creating a file *.properties and name it in .properties To get your locale name type the following lines in console: diff --git a/python/console/console_help/i18n/de_DE.properties b/python/console/help/i18n/de_DE.properties similarity index 100% rename from python/console/console_help/i18n/de_DE.properties rename to python/console/help/i18n/de_DE.properties diff --git a/python/console/console_help/i18n/en_US.properties b/python/console/help/i18n/en_US.properties similarity index 100% rename from python/console/console_help/i18n/en_US.properties rename to python/console/help/i18n/en_US.properties diff --git a/python/console/console_help/i18n/it_IT.properties b/python/console/help/i18n/it_IT.properties similarity index 100% rename from python/console/console_help/i18n/it_IT.properties rename to python/console/help/i18n/it_IT.properties diff --git a/python/console/console_help/i18n/ru_RU.properties b/python/console/help/i18n/ru_RU.properties similarity index 100% rename from python/console/console_help/i18n/ru_RU.properties rename to python/console/help/i18n/ru_RU.properties diff --git a/python/console/console_help/js/encoding.js b/python/console/help/js/encoding.js similarity index 100% rename from python/console/console_help/js/encoding.js rename to python/console/help/js/encoding.js