diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 56fc1a3..6df396a 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -34,17 +34,17 @@ jobs: HUGO_VERSION: 0.147.7 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: fetch-depth: 0 # fetch all history for .GitInfo and .Lastmod submodules: recursive - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v7 with: - go-version: '1.22' + go-version: "1.24.4" - name: Setup Pages id: pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v6 - name: Setup Hugo run: | wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ @@ -55,13 +55,12 @@ jobs: HUGO_ENVIRONMENT: production HUGO_ENV: production run: | - hugo \ - --gc --minify \ - --baseURL "${{ steps.pages.outputs.base_url }}/" + hugo --gc --minify + bash scripts/generate-en-redirects.sh - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v5 with: - path: ./public + path: ./public/ru # Deployment job deploy: @@ -73,4 +72,19 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 + + deploy-english: + runs-on: ubuntu-latest + needs: build + steps: + - name: Trigger English documentation deployment + env: + GH_TOKEN: ${{ secrets.DOCS_EN_TOKEN }} + SOURCE_SHA: ${{ github.sha }} + run: | + gh api \ + --method POST \ + repos/ergohaven/docs-en/dispatches \ + -f event_type=deploy \ + -f "client_payload[source_sha]=$SOURCE_SHA" diff --git a/content/device/archive/hpd.en.md b/content/device/archive/hpd.en.md index a3c5a49..15418a6 100644 --- a/content/device/archive/hpd.en.md +++ b/content/device/archive/hpd.en.md @@ -20,7 +20,7 @@ On the trackball and touchpad modules, you can adjust cursor movement sensitivit {{% details title="Changing DPI in Vial" closed="true" %}} - 1. Download and open [Vial](https://docs.ergohaven.xyz/en/qmk/vial/). + 1. Download and open [Vial](https://docs.eh.industries/software/qmk/vial/). 2. In the top menu, go to the **Layouts** tab. 3. Select the desired DPI value from the dropdown next to DPI. @@ -35,7 +35,7 @@ In this tab you can also configure: {{% /details %}} {{% details title="Configuring Auto mouse in Vial" closed="true" %}} - 1. Download and open [Vial](https://docs.ergohaven.xyz/en/qmk/vial/). + 1. Download and open [Vial](https://docs.eh.industries/software/qmk/vial/). 2. In the top menu, go to the **QMK Settings** tab. 3. Then select the Auto mouse tab. 4. Enable automatic mouse layer activation by checking Enable auto mouse layer feature. diff --git a/content/device/archive/hpd.md b/content/device/archive/hpd.md index bdca062..1b201cc 100644 --- a/content/device/archive/hpd.md +++ b/content/device/archive/hpd.md @@ -21,7 +21,7 @@ sidebar: {{% details title="Изменение DPI в Vial" closed="true" %}} - 1. Скачайте и откройте [Vial](https://docs.ergohaven.xyz/qmk/vial/) + 1. Скачайте и откройте [Vial](https://docs.ergohaven.xyz/software/qmk/vial/) 2. В верхнем меню перейдите во вкладку **Layouts** 3. Выберите нужное значение DPI в раскрывающемся списке напротив пункта DPI @@ -36,7 +36,7 @@ sidebar: {{% /details %}} {{% details title="Настройка Auto mouse в Vial" closed="true" %}} - 1. Скачайте и откройте [Vial](https://docs.ergohaven.xyz/qmk/vial/) + 1. Скачайте и откройте [Vial](https://docs.ergohaven.xyz/software/qmk/vial/) 2. В верхнем меню перейдите во вкладку **QMK Settings** 3. Ниже выберите вкладку Auto mouse 4. Включите автоматическую активацию слоя мыши установив галочку в пункте Enable auto mouse layer feature diff --git a/content/device/archive/imperial44-we.en.md b/content/device/archive/imperial44-we.en.md index ceb7dc5..5239279 100644 --- a/content/device/archive/imperial44-we.en.md +++ b/content/device/archive/imperial44-we.en.md @@ -42,10 +42,10 @@ Imperial44 Wireless Edition is a wireless, programmable mechanical split keyboar {{% /details %}} ## Keyboard configuration -Please refer to the article [Keyboard configuration in ZMK keymap-editor](/zmk/keymap-editor). +Please refer to the article [Keyboard configuration in ZMK keymap-editor](/software/zmk/keymap-editor). ## RuEn mode -Please refer to the article [RuEn layout for wireless keyboards](/zmk/zmk-ruen). +Please refer to the article [RuEn layout for wireless keyboards](/software/zmk/zmk-ruen). ## Firmware update diff --git a/content/device/archive/imperial44-we.md b/content/device/archive/imperial44-we.md index 2b34e44..7b7511e 100644 --- a/content/device/archive/imperial44-we.md +++ b/content/device/archive/imperial44-we.md @@ -43,10 +43,10 @@ Imperial44 Wireless Edition - беспроводная программируе {{% /details %}} ## Настройка клавиатуры -Пожалуйста перейдите в статью [Настройка клавиатуры в ZMK keymap-editor](/zmk/keymap-editor) +Пожалуйста перейдите в статью [Настройка клавиатуры в ZMK keymap-editor](/software/zmk/keymap-editor) ## Режим Ruen -Пожалуйста перейдите в статью [RuEn раскладка для беспроводных клавиатур](/zmk/zmk-ruen) +Пожалуйста перейдите в статью [RuEn раскладка для беспроводных клавиатур](/software/zmk/zmk-ruen) ## Обновление прошивки @@ -69,4 +69,4 @@ Imperial44 Wireless Edition - беспроводная программируе - Подключите клавиатуру к вашему устройству {{% /details %}} -Прошивка клавиатуры с [Ergohaven's Qube](https://docs.ergohaven.xyz/wireless/qube/) +Прошивка клавиатуры с [Ergohaven's Qube](https://docs.ergohaven.xyz/device/archive/qube/) diff --git a/content/device/archive/k03-we.en.md b/content/device/archive/k03-we.en.md index d97bca2..83a701d 100644 --- a/content/device/archive/k03-we.en.md +++ b/content/device/archive/k03-we.en.md @@ -58,29 +58,29 @@ The keyboard supports wired connection via USB-C connector. Use the included cab 4. Start a Bluetooth search on your device and find the keyboard in the list 5. Connect the keyboard to your device {{< callout type="info" >}} - [Adding wireless connection to devices via Qube](https://docs.ergohaven.xyz/en/wireless/qube/) + [Adding wireless connection to devices via Qube](https://docs.eh.industries/device/archive/qube/) {{< /callout >}} {{% /details %}} ## Charging and Battery Monitoring -Refer to the corresponding section of the article [First Steps with a ZMK Keyboard](https://docs.ergohaven.xyz/en/zmk/zmk-keyboards/) +Refer to the corresponding section of the article [First Steps with a ZMK Keyboard](https://docs.eh.industries/software/zmk/zmk-keyboards/) {{< callout type="warning" >}} To charge the keyboard battery, the power switch on the bottom of the half must be in the **On** position. {{< /callout >}} ## Configuration -Refer to the article [Keyboard Configuration in ZMK keymap-editor](/en/zmk/keymap-editor) +Refer to the article [Keyboard Configuration in ZMK keymap-editor](/software/zmk/keymap-editor) ## Ruen Mode -Refer to the article [RuEn Layout for Wireless Keyboards](/en/zmk/zmk-ruen) +Refer to the article [RuEn Layout for Wireless Keyboards](/software/zmk/zmk-ruen) ## Firmware Firmware update is required when: - A new firmware version has been released on [keymap_hub](https://github.com/ergohaven/keymap_hub) - You need to restore the keyboard to factory settings -- You are using custom firmware settings via a [fork](https://docs.ergohaven.xyz/en/zmk/fork-sync/) +- You are using custom firmware settings via a [fork](https://docs.eh.industries/software/zmk/fork-sync/) {{% steps %}} @@ -124,7 +124,7 @@ Copy or drag the *K:03 v4* Uf2 firmware file for the left half — it should reb Firmware update is complete — you can now connect the keyboard to your device! -### Firmware Update via [Ergohaven's Qube](https://docs.ergohaven.xyz/en/wireless/qube/) +### Firmware Update via [Ergohaven's Qube](https://docs.eh.industries/device/archive/qube/) ## Care and Maintenance @@ -142,4 +142,4 @@ Firmware update is complete — you can now connect the keyboard to your device! The keyboard comes with a *3-year warranty and service support*. -If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.ergohaven.xyz/en/) +If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.eh.industries/) diff --git a/content/device/archive/k03-we.md b/content/device/archive/k03-we.md index 9f4bd4e..027a7ae 100644 --- a/content/device/archive/k03-we.md +++ b/content/device/archive/k03-we.md @@ -58,29 +58,29 @@ sidebar: 3. Начните поиск Bluetooth на устройстве и найдите клавиатуру в списке 4. Подключите клавиатуру к устройству {{< callout type="info" >}} - [Добавление беспроводного подключения к устройствам через Qube](https://docs.ergohaven.xyz/wireless/qube/) + [Добавление беспроводного подключения к устройствам через Qube](https://docs.ergohaven.xyz/device/archive/qube/) {{< /callout >}} {{% /details %}} ## Зарядка, мониторинг заряда -Перейдите в соответствующий раздел статьи [Первые шаги с клавиатурой на ZMK](https://docs.ergohaven.xyz/zmk/zmk-keyboards/) +Перейдите в соответствующий раздел статьи [Первые шаги с клавиатурой на ZMK](https://docs.ergohaven.xyz/software/zmk/zmk-keyboards/) {{< callout type="warning" >}} Для зарядки аккумулятора клавиатуры переключатель питания половинки снизу должен быть в положении **Вкл** {{< /callout >}} ## Настройка -Перейдите в статью [Настройка клавиатуры в ZMK keymap-editor](/zmk/keymap-editor) +Перейдите в статью [Настройка клавиатуры в ZMK keymap-editor](/software/zmk/keymap-editor) ## Режим Ruen -Перейдите в статью [RuEn раскладка для беспроводных клавиатур](/zmk/zmk-ruen) +Перейдите в статью [RuEn раскладка для беспроводных клавиатур](/software/zmk/zmk-ruen) ## Прошивка Прошивка требуется в случаях, когда: - Вышло обновление прошивки на [keymap_hub](https://github.com/ergohaven/keymap_hub) - Требуется вернуть клавиатуру к заводским настройкам -- Вы используете собственные настройки в прошивке через [форк](https://docs.ergohaven.xyz/zmk/fork-sync/) +- Вы используете собственные настройки в прошивке через [форк](https://docs.ergohaven.xyz/software/zmk/fork-sync/) {{% steps %}} @@ -124,7 +124,7 @@ sidebar: Прошивка завершена, можно подключать клавиатуру к вашему устройству! -### Прошивка клавиатуры с [Ergohaven's Qube](https://docs.ergohaven.xyz/wireless/qube/) +### Прошивка клавиатуры с [Ergohaven's Qube](https://docs.ergohaven.xyz/device/archive/qube/) ## Уход и обслуживание diff --git a/content/device/archive/k03.en.md b/content/device/archive/k03.en.md index 5fed65e..e80c98b 100644 --- a/content/device/archive/k03.en.md +++ b/content/device/archive/k03.en.md @@ -11,7 +11,7 @@ sidebar: - When connecting the keyboard to the computer, make sure the USB-C cable is firmly inserted into the connector ## Customizing keyboard -Please refer to the [Vial guide](https://docs.ergohaven.xyz/en/qmk/vial/) +Please refer to the [Vial guide](https://docs.eh.industries/software/qmk/vial/) ## Firmware update ### Preparation diff --git a/content/device/archive/k03.md b/content/device/archive/k03.md index 46cfc20..a933f2f 100644 --- a/content/device/archive/k03.md +++ b/content/device/archive/k03.md @@ -13,7 +13,7 @@ sidebar: - При подключении к компьютеру, убедитесь, что кабель USB-C плотно вставлен в разъем ## Настройка клавиатуры -Пожалуйста перейдите в [статью о программе Vial](https://docs.ergohaven.xyz/qmk/vial/) +Пожалуйста перейдите в [статью о программе Vial](https://docs.ergohaven.xyz/software/qmk/vial/) ## Обновление прошивки ### Подготовка: diff --git a/content/device/k04.en.md b/content/device/k04.en.md index da38f10..c6782b1 100644 --- a/content/device/k04.en.md +++ b/content/device/k04.en.md @@ -231,4 +231,4 @@ Firmware update is complete — you can now connect the keyboard to your device! The keyboard comes with a *3-year warranty and service support* -If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.ergohaven.xyz/en/) +If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.eh.industries/) diff --git a/content/device/phenom.en.md b/content/device/phenom.en.md index 2f89f40..99b2316 100644 --- a/content/device/phenom.en.md +++ b/content/device/phenom.en.md @@ -127,4 +127,4 @@ To reflash/update the firmware, the keyboard must be put into bootloader mode. T The keyboard comes with a *3-year warranty and service support*. -If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.ergohaven.xyz/en/) +If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.eh.industries/) diff --git a/content/device/sm30.en.md b/content/device/sm30.en.md index e891e8a..4731569 100644 --- a/content/device/sm30.en.md +++ b/content/device/sm30.en.md @@ -50,7 +50,7 @@ By default you have the base Layer 0 and the additional Layer 1, which is activa 4. **Choose the activation method you want and the layer number to use** ->In this example we will use TG(*), which toggles a layer on if it is off, and off if it is on. You can read more about the other layer switching methods in [our article](https://docs.ergohaven.xyz/en/qmk/vial/#layer). Since we already have 2 layers by default, we will configure Layer 3 for a new layout, so we will choose TG(3), where the number in parentheses is the layer being toggled +>In this example we will use TG(*), which toggles a layer on if it is off, and off if it is on. You can read more about the other layer switching methods in [our article](https://docs.eh.industries/software/qmk/vial/#layer). Since we already have 2 layers by default, we will configure Layer 3 for a new layout, so we will choose TG(3), where the number in parentheses is the layer being toggled ![image](/images/sm30/sm30_layer_1.gif) @@ -205,7 +205,7 @@ In Vial, the Lighting tab lets you customize the key backlight by changing the e After configuring all RGB lighting parameters, click Save in the bottom-right corner of Vial to save all changes {{% /details %}} -**More about Vial features can be found in the [article](https://docs.ergohaven.xyz/en/qmk/vial/)** +**More about Vial features can be found in the [article](https://docs.eh.industries/software/qmk/vial/)** ## Switch replacement / hot-swap encoder installation @@ -294,4 +294,4 @@ To reflash or update the keypad firmware, the keypad needs to be put into bootlo The keypad comes with a *3-year warranty and service support*. -If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.ergohaven.xyz/en/) +If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.eh.industries/) diff --git a/content/device/sm30.md b/content/device/sm30.md index aa73b69..63379f7 100644 --- a/content/device/sm30.md +++ b/content/device/sm30.md @@ -50,7 +50,7 @@ sidebar: 4. **Выберите интересующий метод активации слоя и номер слоя который будет задействован** ->В данном примере рассмотрим переключение слоя через - TG(*), который активирует слой, если он неактивен, и наоборот. Ознакомитья с остальными методами переключения слоев вы можете в [нашей статье](https://docs.ergohaven.xyz/qmk/vial/#layer). По умолчанию у нас уже есть 2 слоя с раскладкой, то в этом примере настроим 3 слой для новой раскладки, по-этому выберем TG(3), где в скобках указан номер переключаемого слоя +>В данном примере рассмотрим переключение слоя через - TG(*), который активирует слой, если он неактивен, и наоборот. Ознакомитья с остальными методами переключения слоев вы можете в [нашей статье](https://docs.ergohaven.xyz/software/qmk/vial/#layer). По умолчанию у нас уже есть 2 слоя с раскладкой, то в этом примере настроим 3 слой для новой раскладки, по-этому выберем TG(3), где в скобках указан номер переключаемого слоя ![image](/images/sm30/sm30_layer_1.gif) @@ -204,7 +204,7 @@ sidebar: После настройки всех параметров RGB подсветки нажмите Save в нижнем правом углу Vial, чтобы сохранить все изменения {{% /details %}} -**Более подробно о функционале Vial читайте в [статье](https://docs.ergohaven.xyz/qmk/vial/)** +**Более подробно о функционале Vial читайте в [статье](https://docs.ergohaven.xyz/software/qmk/vial/)** ## Замена свитчей / установка хотсвап-энкодера diff --git a/content/device/tb-mini.md b/content/device/tb-mini.md index bb9570b..408b81d 100644 --- a/content/device/tb-mini.md +++ b/content/device/tb-mini.md @@ -95,7 +95,7 @@ sidebar: ## Прошивка, мониторинг заряда -Прошивка и мониторинг заряда происходят аналогично беспроводным клавиатурам на ZMK. +Прошивка и мониторинг заряда происходят аналогично беспроводным клавиатурам на ZMK. ## Переключение режимов diff --git a/content/device/tb-royale.en.md b/content/device/tb-royale.en.md index ef2f270..139e86d 100644 --- a/content/device/tb-royale.en.md +++ b/content/device/tb-royale.en.md @@ -52,14 +52,14 @@ The trackball supports wired connection via USB-C. Use the included cable or any ## Charging and battery monitoring -[Charging and battery monitoring](https://docs.ergohaven.xyz/zmk/zmk-keyboards/#%d1%81%d0%be%d1%81%d1%82%d0%be%d1%8f%d0%bd%d0%b8%d0%b5-%d0%b1%d0%b0%d1%82%d0%b0%d1%80%d0%b5%d0%b8) work the same way as for ZMK-based wireless keyboards. +[Charging and battery monitoring](https://docs.eh.industries/software/zmk/zmk-keyboards/#battery-status) work the same way as for ZMK-based wireless keyboards. {{< callout type="warning" >}} To charge the trackball battery, the power switch on the bottom must be in the **On** position. {{< /callout >}} ## Key configuration -You can assign any **behavior** to the trackball buttons using the [keymap editor](https://docs.ergohaven.xyz/zmk/keymap-editor/). +You can assign any **behavior** to the trackball buttons using the [keymap editor](https://docs.eh.industries/software/zmk/keymap-editor/). For example, you can swap the *Sniper* and *Scroll* keys if that layout works better for you. ## Configuration @@ -144,7 +144,7 @@ sniper { Firmware update is needed when: - A firmware update is available on [keymap_hub](https://github.com/ergohaven/keymap_hub) - You need to restore the trackball to factory settings -- You are using custom firmware settings via a [fork](https://docs.ergohaven.xyz/zmk/fork-sync/) +- You are using custom firmware settings via a [fork](https://docs.eh.industries/software/zmk/fork-sync/) {{% steps %}} @@ -197,4 +197,4 @@ Flashing is complete — you can now connect the trackball to your device! Trackball Royale comes with a *3-year warranty and service support*. -If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.ergohaven.xyz/en/) +If you have any questions about setup, firmware, or operation, please contact [the Ergohaven Telegram group](https://t.me/c/1464748383/8323) or [knowledge base](https://docs.eh.industries/) diff --git a/content/device/tb-royale.md b/content/device/tb-royale.md index fe40d33..0ae5d69 100644 --- a/content/device/tb-royale.md +++ b/content/device/tb-royale.md @@ -52,14 +52,14 @@ sidebar: ## Зарядка, мониторинг заряда -[Зарядка и мониторинг заряда](https://docs.ergohaven.xyz/zmk/zmk-keyboards/#%d1%81%d0%be%d1%81%d1%82%d0%be%d1%8f%d0%bd%d0%b8%d0%b5-%d0%b1%d0%b0%d1%82%d0%b0%d1%80%d0%b5%d0%b8) происходят аналогично беспроводным клавиатурам на ZMK +[Зарядка и мониторинг заряда](https://docs.ergohaven.xyz/software/zmk/zmk-keyboards/#%d1%81%d0%be%d1%81%d1%82%d0%be%d1%8f%d0%bd%d0%b8%d0%b5-%d0%b1%d0%b0%d1%82%d0%b0%d1%80%d0%b5%d0%b8) происходят аналогично беспроводным клавиатурам на ZMK {{< callout type="warning" >}} Для зарядки аккумулятора трекбола переключатель питания снизу должен быть в положении **Вкл** {{< /callout >}} ## Настройка клавиш -На клавиши трекбола можно назначить любое **поведение** с помощью [keymap editor](https://docs.ergohaven.xyz/zmk/keymap-editor/) +На клавиши трекбола можно назначить любое **поведение** с помощью [keymap editor](https://docs.ergohaven.xyz/software/zmk/keymap-editor/) Например, можно переназначить (поменять местами) клавиши *Sniper* и *Scroll*, если такое расположение вам окажется более удобным. ## Конфигурирование @@ -144,7 +144,7 @@ sniper { Прошивка требуется в случаях, когда: - Вышло обновление прошивки на [keymap_hub](https://github.com/ergohaven/keymap_hub) - Требуется вернуть трекбол к заводским настройкам -- Вы используете собственные настройки в прошивке через [форк](https://docs.ergohaven.xyz/zmk/fork-sync/) +- Вы используете собственные настройки в прошивке через [форк](https://docs.ergohaven.xyz/software/zmk/fork-sync/) {{% steps %}} diff --git a/content/faq.en.md b/content/faq.en.md index bd80ac4..607061e 100644 --- a/content/faq.en.md +++ b/content/faq.en.md @@ -19,7 +19,7 @@ Our keyboards are compatible with any switches that have **MX pins/base**. Accor **Both versions will fit**. 5-pin switches have two additional plastic pins for better mounting in the PCB. For our keyboards, this does not make much difference because the switches are mounted in the case, not in the PCB ### How do I configure my keyboard? How do I remap keys? -Use the [Entropy](https://github.com/ergohaven/entropy) configurator to remap keys and configure your keyboard. Setup instructions are available in the [documentation](https://docs.ergohaven.xyz/en/) +Use the [Entropy](https://github.com/ergohaven/entropy) configurator to remap keys and configure your keyboard. Setup instructions are available in the [documentation](https://docs.eh.industries/) ### How can I keep symbols in the same place regardless of the keyboard layout? Use **Universal Symbols** in the [Entropy](https://github.com/ergohaven/entropy) configurator diff --git a/content/software/zmk/keymap-editor.en.md b/content/software/zmk/keymap-editor.en.md index ae94c63..005fc61 100644 --- a/content/software/zmk/keymap-editor.en.md +++ b/content/software/zmk/keymap-editor.en.md @@ -55,7 +55,7 @@ The opened page displays the statuses of all build stages. After all stages are ![image](/images/keymap-editor/firmware.png) -After downloading the `firmware` archive, flash the keyboard with the files from it, following the steps described in the First steps with a Keyboard on ZMK (see the "Keyboard firmware" section). +After downloading the `firmware` archive, flash the keyboard with the files from it, following the steps described in the First steps with a Keyboard on ZMK (see the "Keyboard firmware" section). Changes to the layout have been made! diff --git a/content/software/zmk/keymap-editor.md b/content/software/zmk/keymap-editor.md index c295f96..1772485 100644 --- a/content/software/zmk/keymap-editor.md +++ b/content/software/zmk/keymap-editor.md @@ -65,7 +65,7 @@ Keymap-editor является веб-приложением, он доступ ![image](/images/keymap-editor/firmware.png) -После скачивания архива `firmware` прошиваем файлами из него клавиатуру по шагам, описанным в первых шагах с клавиатурой на ZMK (см. раздел «Прошивка клавиатуры»). +После скачивания архива `firmware` прошиваем файлами из него клавиатуру по шагам, описанным в первых шагах с клавиатурой на ZMK (см. раздел «Прошивка клавиатуры»). Изменения в раскладку внесены! diff --git a/data/firmware_instructions.yaml b/data/firmware_instructions.yaml index 3ca9d40..987dc96 100644 --- a/data/firmware_instructions.yaml +++ b/data/firmware_instructions.yaml @@ -157,7 +157,7 @@ zmk_split: - "After the update, press Reset on both halves simultaneously to reconnect them" step_notes: - after_step: 1 - text: 'If you want to use RuEn, download the corresponding RuEn firmware' + text: 'If you want to use RuEn, download the corresponding RuEn firmware' note: "If a copy or disk ejection error appears while copying the firmware, simply ignore the message" zmk_qube: @@ -183,7 +183,7 @@ zmk_qube: - "After the update, connect Qube via USB-C. Then turn on the left half — it should appear on Qube along with its battery level. Finally, turn on the right half" step_notes: - after_step: 1 - text: 'If you want to use RuEn, download the corresponding RuEn firmware for Qube' + text: 'If you want to use RuEn, download the corresponding RuEn firmware for Qube' - after_step: 3 text: "During the update, the halves must be powered off — the power switch on the bottom must be in the off position" note: "If a copy or disk ejection error appears while copying the firmware, simply ignore the message" diff --git a/hugo.yaml b/hugo.yaml index 7879fca..3c88df6 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -1,4 +1,3 @@ -baseURL: "https://docs.ergohaven.xyz/" title: ergohaven docs cleanDestinationDir: true @@ -11,8 +10,12 @@ defaultContentLanguage: ru languages: ru: + baseURL: "https://docs.ergohaven.xyz/" + languageCode: ru-RU languageName: Русский weight: 1 + params: + brandURL: "https://eh.works/" menus: main: - identifier: docs @@ -50,8 +53,12 @@ languages: type: theme-toggle label: true # опционально, по умолчанию false en: + baseURL: "https://docs.eh.industries/" + languageCode: en-US languageName: English weight: 2 + params: + brandURL: "https://eh.industries/" menus: main: - identifier: docs diff --git a/layouts/404.html b/layouts/404.html new file mode 100644 index 0000000..ddf34fd --- /dev/null +++ b/layouts/404.html @@ -0,0 +1,58 @@ + + + + + + {{- if eq .Site.Language.Lang "ru" }} + + {{- end }} + Page not found + + +
+ +

+ 404 +

+
+

This page could not be found.

+
+
+ + diff --git a/layouts/partials/custom/head-end.html b/layouts/partials/custom/head-end.html new file mode 100644 index 0000000..8b43dcf --- /dev/null +++ b/layouts/partials/custom/head-end.html @@ -0,0 +1,6 @@ +{{- range .AllTranslations }} + +{{- end }} +{{- range where .AllTranslations "Language.Lang" "en" }} + +{{- end }} diff --git a/layouts/partials/navbar-title.html b/layouts/partials/navbar-title.html new file mode 100644 index 0000000..8b70ea9 --- /dev/null +++ b/layouts/partials/navbar-title.html @@ -0,0 +1,16 @@ +{{- $logoPath := .Site.Params.navbar.logo.path | default "images/logo.svg" -}} +{{- $logoLink := .Site.Params.brandURL | default .Site.Home.Permalink -}} +{{- $logoWidth := .Site.Params.navbar.logo.width | default "20" -}} +{{- $logoHeight := .Site.Params.navbar.logo.height | default "20" -}} +{{- $logoDarkPath := .Site.Params.navbar.logo.dark | default $logoPath -}} + + + {{- $displayTitle := (.Site.Params.navbar.displayTitle | default true) }} + {{- if (.Site.Params.navbar.displayLogo | default true) }} + {{ cond $displayTitle `Logo` .Site.Title }} + {{ cond $displayTitle `Dark Logo` .Site.Title }} + {{- end }} + {{- if $displayTitle }} + {{- .Site.Title -}} + {{- end }} + diff --git a/layouts/partials/utils/lang-link.html b/layouts/partials/utils/lang-link.html new file mode 100644 index 0000000..b9e26de --- /dev/null +++ b/layouts/partials/utils/lang-link.html @@ -0,0 +1,23 @@ +{{/* Return an absolute link because translations are published on different hosts. */}} + +{{ $page := .context }} +{{ $lang := .lang }} +{{ $link := false }} + +{{ range $page.AllTranslations }} + {{ if eq .Language.Lang $lang }} + {{ $link = .Permalink }} + {{ end }} +{{ end }} + +{{ if not $link }} + {{ range where $page.Sites ".Language.Lang" $lang }} + {{ $link = .Home.Permalink }} + {{ end }} +{{ end }} + +{{ if not $link }} + {{ $link = site.Home.Permalink }} +{{ end }} + +{{ return $link }} diff --git a/scripts/generate-en-redirects.sh b/scripts/generate-en-redirects.sh new file mode 100644 index 0000000..0cebf03 --- /dev/null +++ b/scripts/generate-en-redirects.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +set -euo pipefail + +source_dir="${1:-public/en}" +destination_dir="${2:-public/ru/en}" +target_origin="${3:-https://docs.eh.industries}" + +if [[ ! -d "$source_dir" ]]; then + echo "English build directory does not exist: $source_dir" >&2 + exit 1 +fi + +find "$source_dir" -type f -name index.html -print0 | + while IFS= read -r -d '' source_file; do + relative_file="${source_file#"$source_dir"/}" + relative_path="${relative_file%index.html}" + target_url="${target_origin%/}/${relative_path}" + destination_file="$destination_dir/$relative_file" + + mkdir -p "$(dirname "$destination_file")" + + cat > "$destination_file" < + + + + + + + Documentation moved + + + +

The English documentation has moved to ${target_url}.

+ + +EOF + done