Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 0x4A6F-master
  • 0x4A6F-rpi4
  • autinerd/experimental-openwrt-24.10
  • experimental
  • feature/addMikrotikwAP
  • master
  • nrb/airmax-test
  • nrb/ar9344-reset-sequence
  • nrb/ex400-remove-wps
  • nrb/gluon-master-cpe510
  • nrb/test-radv-filter
  • nrbffs/fastd-remove-delay
  • nrbffs/netgear-ex6120
  • v2018.2.2-ffs
  • v2018.2.3-ffs
  • v2019.1-ffs
  • v2019.1.1-ffs
  • v2019.1.2-ffs
  • v2020.1-ffs
  • v2020.1.1-ffs
  • v2020.1.3-ffs
  • v2020.2-ffs
  • v2020.2.1-ffs
  • v2020.2.2-ffs
  • v2020.2.3-ffs
  • v2021.1-ffs
  • v2021.1.1-ffs
  • v2021.1.2-ffs
  • v2022.1.1-ffs
  • v2022.1.3-ffs
  • v2022.1.4-ffs
  • v2023.1-ffs
  • v2023.2-ffs
  • v2023.2.2-ffs
  • v2023.2.3-ffs
  • v2023.2.4-ffs
  • v2023.2.5-ffs
  • experimental-2022-09-24
  • experimental-2022-09-24-base
  • experimental-2023-03-11
  • experimental-2023-03-11-base
  • experimental-2023-03-12
  • experimental-2023-03-12-base
  • experimental-2023-03-16
  • experimental-2023-03-16-base
  • experimental-2023-03-20
  • experimental-2023-03-20-base
  • experimental-2023-03-23
  • experimental-2023-03-23-base
  • experimental-2023-03-25
  • experimental-2023-03-25-base
  • experimental-2023-03-26
  • experimental-2023-03-26-base
  • experimental-2023-03-30
  • experimental-2023-03-30-base
  • experimental-2023-03-31
  • experimental-2023-03-31-base
  • experimental-2023-04-01
  • experimental-2023-04-01-base
  • experimental-2023-04-08
  • experimental-2023-04-08-base
  • experimental-2023-04-10
  • experimental-2023-04-10-base
  • experimental-2023-04-13
  • experimental-2023-04-13-base
  • experimental-2023-04-15
  • experimental-2023-04-15-base
  • experimental-2023-04-16
  • experimental-2023-04-16-base
  • experimental-2023-04-18
  • experimental-2023-04-18-base
  • experimental-2023-04-20
  • experimental-2023-04-20-base
  • experimental-2023-04-26
  • experimental-2023-04-26-base
  • experimental-2023-04-28
  • experimental-2023-04-28-base
  • experimental-2023-04-30
  • experimental-2023-04-30-base
  • experimental-2023-05-02
  • experimental-2023-05-02-base
  • experimental-2023-05-03
  • experimental-2023-05-03-base
  • experimental-2023-05-12
  • experimental-2023-05-12-base
  • experimental-2023-05-21
  • experimental-2023-05-21-base
  • experimental-2023-05-25
  • experimental-2023-05-25-base
  • experimental-2023-07-02
  • experimental-2023-07-02-base
  • experimental-2023-07-04
  • experimental-2023-07-04-base
  • experimental-2023-07-12
  • experimental-2023-07-12-base
  • experimental-2023-07-16
  • experimental-2023-07-16-base
  • experimental-2023-08-04
  • experimental-2023-08-04-base
  • experimental-2023-08-10
  • experimental-2023-08-10-base
  • experimental-2023-09-08
  • experimental-2023-09-08-base
  • experimental-2023-09-09
  • experimental-2023-09-09-base
  • experimental-2023-09-10
  • experimental-2023-09-10-base
  • experimental-2023-09-11
  • experimental-2023-09-11-base
  • experimental-2023-09-12
  • experimental-2023-09-12-base
  • experimental-2023-09-13
  • experimental-2023-09-13-base
  • experimental-2023-09-15
  • experimental-2023-09-15-base
  • experimental-2023-09-16
  • experimental-2023-09-16-base
  • experimental-2023-09-18
  • experimental-2023-09-18-base
  • experimental-2023-09-20
  • experimental-2023-09-20-base
  • experimental-2023-09-27
  • experimental-2023-09-27-base
  • experimental-2023-09-28
  • experimental-2023-09-28-base
  • experimental-2023-09-29
  • experimental-2023-09-29-base
  • experimental-2023-10-02
  • experimental-2023-10-02-base
  • experimental-2023-10-13
  • experimental-2023-10-13-base
  • experimental-2023-10-14
  • experimental-2023-10-14-base
  • experimental-2023-10-16
  • experimental-2023-10-16-base
  • experimental-2023-10-23
  • experimental-2023-10-23-base
137 results

Target

Select target project
  • firmware/gluon
  • 0x4A6F/gluon
  • patrick/gluon
3 results
Select Git revision
  • 0x4A6F-master
  • 0x4A6F-rpi4
  • 2014.3.x
  • 2014.4.x
  • babel
  • hoodselector
  • master
  • radv-filterd
  • v2015.1.x
  • v2016.1.x
  • v2016.2.4-batmanbug
  • v2016.2.x
  • v2018.2.2-ffs
  • v2018.2.x
  • v2014.1
  • v2014.2
  • v2014.3
  • v2014.3.1
  • v2014.4
  • v2015.1
  • v2015.1.1
  • v2015.1.2
  • v2016.1
  • v2016.1.1
  • v2016.1.2
  • v2016.1.3
  • v2016.1.4
  • v2016.1.5
  • v2016.1.6
  • v2016.2
  • v2016.2.1
  • v2016.2.2
  • v2016.2.3
  • v2016.2.4
  • v2016.2.5
  • v2016.2.6
  • v2016.2.7
  • v2017.1
  • v2017.1.1
  • v2017.1.2
  • v2017.1.3
  • v2017.1.4
  • v2017.1.5
  • v2017.1.6
  • v2017.1.7
  • v2017.1.8
  • v2018.1
  • v2018.1.1
  • v2018.1.2
  • v2018.1.3
  • v2018.1.4
  • v2018.2
  • v2018.2-ffs0.1
  • v2018.2.1
  • v2018.2.1-ffs0.1
  • v2018.2.2-ffs0.1
56 results
Show changes
Showing
with 1248 additions and 367 deletions
...@@ -10,53 +10,70 @@ General guidelines ...@@ -10,53 +10,70 @@ General guidelines
nice-to-have, but not required. If you don't know a language well, rather leave the translation nice-to-have, but not required. If you don't know a language well, rather leave the translation
blank, so it is obvious that there is no proper translation yet. blank, so it is obvious that there is no proper translation yet.
* Existing expert mode packages should be made translatable as soon as possible. * Existing expert mode packages should be made translatable as soon as possible.
* The "message IDs" (which are the arguments to the ``translate`` function) should be the * The "message IDs" (which are the arguments to the *translate* function) should be the
English texts. English texts.
i18n support in LuCI i18n support in Gluon
-------------------- ---------------------
Internationalization support can be found in the ``luci.i18n`` package. Internationalization support is available in all components (models, view and
Strings are translated using the ``i18n.translate`` and ``i18n.translatef`` functions controllers) of *gluon-web*-based packages. Strings are translated using the *translate*,
(``translate`` for static strings, ``translatef`` for printf-like formatted string). *_translate* and *translatef* functions (*translate* for static strings, *translatef*
for printf-like formatted string; *_translate* works the same as *translate*, but
will return *nil* instead of the original string when no translation is available).
Example from the ``gluon-config-mode-geo-location`` package:: In views, the special tags ``<%:...%>`` can be used to translate the contained string.
local i18n = require "luci.i18n" Example from the *gluon-config-mode-geo-location* package:
o = s:option(cbi.Flag, "_location", i18n.translate("Show node on the map"))
.. code-block:: lua
local share_location = s:option(Flag, "location", translate("Show node on the map"))
Note that translations are *namespaced*: each package will only use its own
translation strings by default. For this purpose, the package name must by
specified in a package's controller. It is possible to access a different
translation package using the *i18n* function from models and view, which is
necessary when strings from the site configuration are used, or packages do not
have their own controller (which is the case for config mode wizard components).
.. code-block:: lua
local site_i18n = i18n 'gluon-site'
local msg = site_i18n._translate('gluon-config-mode:welcome')
Adding translation templates to Gluon packages Adding translation templates to Gluon packages
---------------------------------------------- ----------------------------------------------
The i18n support is based on the standard gettext system. For each translatable package, The i18n support is based on the standard gettext system. For each translatable package,
a translation template with extension ``.pot`` can be created using the ``i18n-scan.pl`` a translation template with extension ``.pot`` can be created using the *i18n-scan.pl*
script from the LuCI repository:: script in the ``contrib`` directory:
cd package/gluon-config-mode-geo-location .. code-block:: sh
cd package/gluon-web-mesh-vpn-fastd
mkdir i18n mkdir i18n
cd i18n cd i18n
../../../packages/luci/build/i18n-scan.pl ../files > gluon-config-mode-geo-location.pot ../../../contrib/i18n-scan.pl ../files ../luasrc > gluon-web-mesh-vpn-fastd.pot
The entries in the template can be reordered after the generation if desirable. Lots of standard The same command can be run again to update the template.
translations like "Cancel" are already available in the LuCI base translation file (see
``packages/luci/po/templates/base.pot``) and can be removed from the template.
In addition, some additions to the Makefile must be made. Instead of OpenWrt's default ``package.mk``, In addition, the Makefile must be adjusted. Instead of OpenWrt's default *package.mk*,
the Gluon version ``$(GLUONDIR)/include/package.mk`` must be used. The i18n files must be installed the Gluon version (``../gluon.mk`` for core packages) must be used. The i18n files must be installed
and PKG_CONFIG_DEPENDS must be added:: and PKG_CONFIG_DEPENDS must be added::
... ...
include $(GLUONDIR)/include/package.mk include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
... ...
define Build/Compile define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-geo-location,i18n) $(call GluonBuildI18N,gluon-web-mesh-vpn-fastd,i18n)
endef endef
define Package/gluon-config-mode-geo-location/install define Package/gluon-web-mesh-vpn-fastd/install
... ...
$(call GluonInstallI18N,gluon-config-mode-geo-location,$(1)) $(call GluonInstallI18N,gluon-web-mesh-vpn-fastd,$(1))
endef endef
... ...
...@@ -64,29 +81,29 @@ and PKG_CONFIG_DEPENDS must be added:: ...@@ -64,29 +81,29 @@ and PKG_CONFIG_DEPENDS must be added::
Adding translations Adding translations
------------------- -------------------
A new translation file for a template can be added using the ``msginit`` command:: A new translation file for a template can be added using the *msginit* command:
.. code-block:: sh
cd package/gluon-config-mode-geo-location/i18n cd package/gluon-web-mesh-vpn-fastd/i18n
msginit -l de msginit -l de
This will create the file ``de.po`` in which the translations can be added. This will create the file *de.po* in which the translations can be added.
The translation file can be updated to a new template version using the ``msgmerge`` command:: The translation file can be updated to a new template version using the *msgmerge* command:
msgmerge -U de.po gluon-config-mode-geo-location.pot .. code-block:: sh
msgmerge -U de.po gluon-web-mesh-vpn-fastd.pot
After the merge, the translation file should be checked for "fuzzy matched" entries where After the merge, the translation file should be checked for "fuzzy matched" entries where
the original English texts have changed. All entries from the translation file should be the original English texts have changed. All entries from the translation file should be
translated in the ``.po`` file (or removed from it, so the original English texts are displayed translated in the *.po* file (or removed from it, so the original English texts are displayed
instead). instead).
Adding support for new languages Adding support for new languages
-------------------------------- --------------------------------
A list of all languages supported by LuCI can be found in the ``packages/luci/luci.mk`` file after A list of all languages supported by *gluon-web* can be found in ``package/gluon.mk``.
Gluon's dependencies have been downloaded using ``make update``. Adding translations for these New languages just need to be added to *GLUON_SUPPORTED_LANGS*, and a human-readable
languages is straightforward using the ``msginit`` command. language name must be defined.
For other languages, support must be added to LuCI first, which constitutes completely translating
the ``base.pot``. Please contact the upstream LuCI maintainers at https://github.com/openwrt/luci/
if you'd like to do this.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/features/configmode.png

112 KiB

...@@ -14,10 +14,13 @@ Activating Config Mode ...@@ -14,10 +14,13 @@ Activating Config Mode
---------------------- ----------------------
Config Mode is automatically entered at the first boot. You can re-enter Config Mode is automatically entered at the first boot. You can re-enter
Config Mode by pressing and holding the RESET/WPS button for about three Config Mode by pressing and holding the RESET/WPS/DECT button for about three
seconds. The device should reboot (all LEDs will turn of briefly) and seconds. The device should reboot (all LEDs will turn off briefly) and
Config Mode will be available. Config Mode will be available.
If you have access to the console of the node, there is the
``gluon-enter-setup-mode`` command, which reboots a node into Config Mode.
Port Configuration Port Configuration
------------------ ------------------
...@@ -35,3 +38,17 @@ Accessing Config Mode ...@@ -35,3 +38,17 @@ Accessing Config Mode
Config Mode can be accessed at http://192.168.1.1. The node will offer DHCP Config Mode can be accessed at http://192.168.1.1. The node will offer DHCP
to clients. Should this fail, you may assign an IP from 192.168.1.0/24 to to clients. Should this fail, you may assign an IP from 192.168.1.0/24 to
your computer manually. your computer manually.
.. image:: configmode.png
Advanced Config Options
-----------------------
Depending on the installed packages, the advanced config mode allows to configure packages further.
* :doc:`gluon-web-wifi-config enable <wlan-configuration>` radios used for wifi and mesh as well as outdoor mode
* :doc:`../package/gluon-web-network` allows to configure the used roles (uplink, mesh, client) on each interface
* :doc:`../package/gluon-web-admin` allows to enter SSH keys or set a password in the `Remote access` section
* :doc:`../package/gluon-web-cellular` allows to configure SIM card / WWAN settings on supported cellular devices
The advanced config does also allow to upload a sysupgrade file to update the firmware to a different version.
This diff is collapsed.
docs/features/fastd_mode.gif

28.1 KiB

This diff is collapsed.
This diff is collapsed.
docs/features/multidomain_configmode.gif

57.1 KiB

This diff is collapsed.
This diff is collapsed.
docs/features/status-page.png

150 KiB

This diff is collapsed.
TLS support
===========
The generic TLS implementation which is currently used by OpenWRT can be installed or added as dependency through the package ``gluon-tls``.
This removes the need for community packages to depend on a specific TLS implementation (like mbedtls, OpenSSL or WolfSSL).
This package is an alias for the current TLS implementation used.
To allow for easy usage of communicating through HTTPS from the node, typical Certificate Authorities (CAs) are included through the package ``ca-bundle`` .
* Starting with OpenWRT 23.05, mbedtls is the default TLS layer - this is reflected in Gluon :ref:`v2023.2 <releases-v2023.2-minor-changes>`. HTTPS is used by default to communicate with OpenWRT opkg servers.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.