Merge branch 'main' into beta-4.50.6

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Node Build
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
   workflow_dispatch:
 

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, beta* ]
+    branches: [ main, beta* ]
   pull_request:
-    branches: [ master, beta* ]
+    branches: [ main, beta* ]
   schedule:
     - cron: '17 9 * * 2'
 

CONTRIBUTING.md

@@ -72,4 +72,4 @@ npm run test
 
 Additional language translations, or improvements to existing translations are most welcome.  Translations can be found here: 
 
-https://github.com/homebridge/homebridge-config-ui-x/tree/master/ui/src/i18n
+https://github.com/homebridge/homebridge-config-ui-x/tree/main/ui/src/i18n

scripts/lang-sync.ts

@@ -11,14 +11,14 @@ const basePath = path.dirname(__dirname);
 const langFiles = fs.readdirSync(path.resolve(basePath, 'ui/src/i18n'))
   .filter(x => x.endsWith('.json'));
 
-const master = fs.readJsonSync(path.resolve(basePath, 'ui/src/i18n/en.json'));
+const main = fs.readJsonSync(path.resolve(basePath, 'ui/src/i18n/en.json'));
 
 for (const lang of langFiles) {
   const langPath = path.resolve(basePath, 'ui/src/i18n', lang);
   const translationStrings = fs.readJsonSync(langPath);
 
   if (lang !== 'en.json') {
-    for (const [key, value] of Object.entries(master)) {
+    for (const [key, value] of Object.entries(main)) {
       if (!translationStrings.hasOwnProperty(key)) {
         translationStrings[key] = value;
       }
@@ -32,4 +32,4 @@ for (const lang of langFiles) {
   });
 
   fs.writeJSONSync(langPath, ordered, { spaces: 4 });
-}
+}

src/bin/hb-service.ts

@@ -50,7 +50,7 @@ export class HomebridgeServiceHelper {
   // send logs to stdout instead of the homebridge.log
   private stdout: boolean;
 
-  // oznu/docker-homebridge options
+  // homebridge/docker-homebridge options
   public docker: boolean;
   private uid: number;
   private gid: number;
@@ -932,7 +932,7 @@ export class HomebridgeServiceHelper {
 
   /**
    * Test to see if the avahi-daemon service is running
-   * @returns 
+   * @returns
    */
   private async isAvahiDaemonRunning(): Promise<boolean> {
     if (os.platform() !== 'linux') {
@@ -1122,7 +1122,7 @@ export class HomebridgeServiceHelper {
 
   /**
    * Fix the permission on the docker storage directory
-   * This is only used when running in the oznu/docker-homebridge docker container
+   * This is only used when running in the homebridge/docker-homebridge docker container
    */
   private fixDockerPermissions() {
     try {

src/bin/platforms/linux.ts

@@ -341,7 +341,7 @@ export class LinuxInstaller extends BasePlatform {
       const osInfo = await si.osInfo();
       if (osInfo.distro === 'Alpine Linux') {
         this.hbService.logger('Updating Node.js on Alpine Linux / Docker is not supported by this command.', 'fail');
-        this.hbService.logger('To update Node.js you should pull down the latest version of the oznu/homebridge Docker image.', 'fail');
+        this.hbService.logger('To update Node.js you should pull down the latest version of the homebridge/homebridge Docker image.', 'fail');
       } else {
         this.hbService.logger('Updating Node.js using this tool is not supported on your version of Linux.');
       }

src/core/config/config.service.ts

@@ -262,7 +262,7 @@ export class ConfigService {
   }
 
   /**
-   * Populate the required config for oznu/homebridge docker
+   * Populate the required config for homebridge/homebridge docker
    */
   private setConfigForDocker() {
     // forced config

src/modules/platform-tools/docker/docker.controller.ts

@@ -15,21 +15,21 @@ export class DockerController {
   ) { }
 
   @UseGuards(AdminGuard)
-  @ApiOperation({ summary: 'Return the oznu/homebridge docker image startup.sh file contents.' })
+  @ApiOperation({ summary: 'Return the homebridge/homebridge docker image startup.sh file contents.' })
   @Get('startup-script')
   getStartupScript() {
     return this.dockerService.getStartupScript();
   }
 
   @UseGuards(AdminGuard)
-  @ApiOperation({ summary: 'Update the oznu/homebridge docker image startup.sh file contents.' })
+  @ApiOperation({ summary: 'Update the homebridge/homebridge docker image startup.sh file contents.' })
   @Put('startup-script')
   updateStartupScript(@Body() body) {
     return this.dockerService.updateStartupScript(body.script);
   }
 
   @UseGuards(AdminGuard)
-  @ApiOperation({ summary: 'Restart the oznu/homebridge docker image container.' })
+  @ApiOperation({ summary: 'Restart the homebridge/homebridge docker image container.' })
   @Put('restart-container')
   restartDockerContainer() {
     return this.dockerService.restartDockerContainer();

src/modules/plugins/plugins.service.ts

@@ -326,9 +326,9 @@ export class PluginsService {
 
   /**
    * Manage a plugin, install, update or uninstall it
-   * @param action 
-   * @param pluginAction 
-   * @param client 
+   * @param action
+   * @param pluginAction
+   * @param client
    */
   async managePlugin(action: 'install' | 'uninstall', pluginAction: PluginActionDto, client: EventEmitter) {
     pluginAction.version = pluginAction.version || 'latest';
@@ -593,7 +593,7 @@ export class PluginsService {
 
   /**
    * Check to see if a plugin update bundle is available
-   * @param pluginAction 
+   * @param pluginAction
    */
   public async isPluginBundleAvailable(pluginAction: PluginActionDto) {
     if (
@@ -616,8 +616,8 @@ export class PluginsService {
 
   /**
    * Update a plugin using the bundle
-   * @param pluginAction 
-   * @param client 
+   * @param pluginAction
+   * @param client
    */
   public async doPluginBundleUpdate(pluginAction: PluginActionDto, client: EventEmitter) {
     const pluginUpgradeInstallScriptPath = path.join(process.env.UIX_BASE_PATH, 'plugin-upgrade-install.sh');
@@ -658,7 +658,7 @@ export class PluginsService {
 
   /**
    * Do a UI update from the bundle
-   * @param version 
+   * @param version
    */
   public async doUiBundleUpdate(pluginAction: PluginActionDto, client: EventEmitter) {
     const prefix = path.dirname(path.dirname(path.dirname(process.env.UIX_BASE_PATH)));
@@ -674,7 +674,7 @@ export class PluginsService {
 
   /**
    * Sets a flag telling the system to update the package next time the UI is restarted
-   * Dependend on OS support - currently only supported by the oznu/homebridge docker image
+   * Dependend on OS support - currently only supported by the homebridge/homebridge docker image
    */
   public async updateSelfOffline(client: EventEmitter) {
     client.emit('stdout', color.yellow(`${this.configService.name} has been scheduled to update on the next container restart.\n\r\n\r`));
@@ -1216,7 +1216,7 @@ export class PluginsService {
 
   /**
    * Returns the "latest" version for the provided module
-   * @param npmModuleName 
+   * @param npmModuleName
    */
   public async getNpmModuleLatestVersion(npmModuleName: string): Promise<string> {
     try {
@@ -1404,7 +1404,7 @@ export class PluginsService {
     clearTimeout(this.verifiedPluginsRetryTimeout);
     try {
       this.verifiedPlugins = (
-        await this.httpService.get('https://raw.githubusercontent.com/homebridge/verified/master/verified-plugins.json', {
+        await this.httpService.get('https://raw.githubusercontent.com/homebridge/verified/main/verified-plugins.json', {
           httpsAgent: null,
         }).toPromise()
       ).data;

ui/src/i18n/bg.json

@@ -32,7 +32,6 @@
     "accessories.control.label_opening": "Отваряне",
     "accessories.control.label_rotation_speed": "Скорост на въртене",
     "accessories.control.label_running": "Running",
-    "accessories.control.label_set_to": "Задай",
     "accessories.control.label_speaker_volume": "Сила на звука",
     "accessories.control.label_stopped": "Спряно",
     "accessories.control.label_target": "Цел",
@@ -41,7 +40,6 @@
     "accessories.control.label_triggered": "Задействан",
     "accessories.control.label_unknown": "Непознат",
     "accessories.control.label_unlocked": "Отключено",
-    "accessories.control.not_supported": "Не се поддържа",
     "accessories.label_hide_this_accessory": "Скрий аксесоара",
     "accessories.label_name": "Име",
     "accessories.label_room_name": "Име на стая",
@@ -90,7 +88,6 @@
     "child_bridge.message_select_platforms_accessories": "Select which platforms or accessories you want to run as a child bridge",
     "child_bridge.message_wiki_link": "Learn more about child bridges",
     "child_bridge.toast_restart_requested": "Child bridge restart requested.",
-    "config.button_backup": "Резервно копие",
     "config.button_restore": "Възстанови",
     "config.restore.button_remote_all_backups": "Изтрий всички резервни копия",
     "config.restore.message_copy_to_editor": "Копирай в редактор",
@@ -122,7 +119,6 @@
     "login.label_username": "Потребителско Име",
     "login.message_invalid_2fa_code": "The code entered is incorrect or has expired.",
     "login.message_invalid_username_or_password": "Грешно потребителско име или парола",
-    "login.title_login": "Вписване",
     "logs.label_download": "Download",
     "logs.label_truncate": "Truncate",
     "logs.message_download_warning": "WARNING: Homebridge log files may contain personal information, passwords or access tokens. Please review the log file and remove any sensitive information before sharing with others.",
@@ -151,10 +147,6 @@
     "platform.docker.restart_container.title_restarting": "Рестартиране на Docker контейнера",
     "platform.docker.restart_container.toast_container_restarted": "Docker контейнера е рестартиран",
     "platform.docker.settings.button_restart_required": "Нужно е рестартиране",
-    "platform.docker.settings.message_image_upgrade_required": "Моля обновете oznu/homebridge образ за Docker до последната версия.",
-    "platform.docker.settings.title_settings": "Настройки",
-    "platform.docker.settings.toast_container_restart_required": "Нужно е рестартиране на контейнера",
-    "platform.docker.settings.toast_title_settings_saved": "Настройките са запаметени",
     "platform.docker.startup_script.message_script_help": "Този скрипт ще се изпълнява всеки път, когато стартира Docker контейнера. Може да използвате това, за да инсталирате всички допълнителни пакети, от които вашите плъгини може да се нуждаят като ffmpeg или libpcap-dev.",
     "platform.docker.startup_script.toast_restart_required": "Трябва да рестартирате този Docker контейнер за да влезнат в сила промените.",
     "platform.docker.startup_script.toast_script_must_use_hashbang": "Скриптът трябва да използва #!/bin/sh hashbang.",
@@ -180,12 +172,10 @@
     "plugins.donate.button_donate": "Donate",
     "plugins.donate.message_learn_more": "Learn more about donation links on plugins.",
     "plugins.donate.tile_donate_to": "Donate to {{ author }}",
-    "plugins.label_certified_plugin": "Сертифицирана добавка",
     "plugins.manage.button_restart_now": "Рестартирай Homebridge сега",
     "plugins.manage.disable": "Disable",
     "plugins.manage.enable": "Enable",
     "plugins.manage.json_config": "JSON Config",
-    "plugins.manage.label_homebridge_upgraded": "Homebridge Актуализиран",
     "plugins.manage.label_install": "Инсталирай",
     "plugins.manage.label_installed": "Инсталиран",
     "plugins.manage.label_manual_update_required": "Manual Update Required",
@@ -194,7 +184,6 @@
     "plugins.manage.label_uninstalled": "Изтрит",
     "plugins.manage.label_update": "Актуализирай",
     "plugins.manage.label_updated": "Актуализиран",
-    "plugins.manage.label_upgrade": "Актуализирай",
     "plugins.manage.message_confirm_disable": "Are you sure you want to disable {{ pluginName }}? Any accessories exposed by this plugin will be removed from HomeKit.",
     "plugins.manage.message_confirm_enable": "Are you sure you want to enable {{ pluginName }}?",
     "plugins.manage.message_install_alternate_version": "Install Alternate Version",
@@ -230,7 +219,6 @@
     "plugins.tooltip_update_plugin_to": "Актуализирай добавката до v{{latestVersion}}",
     "reset.accessories_will_may_need_to_be_reconfigured": "After performing this action some accessories may need to be reconfigured in HomeKit or re-added to your automations.",
     "reset.button_reset_homebridge_now": "Нулирай Homebridge сега",
-    "reset.label_reset_homebridge": "Нулирай homebridge",
     "reset.message_accessory_config_will_not_be_changed": "Останалата част от конфигурацията ви няма да бъде променена. Ако Homebridge не се стартира поради лоша конфигурация, нулирането няма да го поправи.",
     "reset.message_action_is_irreversible": "Това действие е необратимо. Моля, прочетете внимателно, преди да продължите.",
     "reset.message_all_automations_will_be_reset": "Всички автоматизации и ще трябва да бъдат пренастроени след нулиране.",
@@ -245,7 +233,6 @@
     "reset.title_clear_cached_accessories": "Remove All Cached Accessories",
     "reset.title_clear_cached_accessories_single": "Remove Single Cached Accessory",
     "reset.title_force_restart_hb_service": "Force Service Restart",
-    "reset.title_force_restart_hb_service_short": "Restart Service",
     "reset.title_reset": "Reset",
     "reset.title_reset_homebridge_accessory": "Нулирай Homebridge аксесоар",
     "reset.title_unpair_bridges_cameras_tv_external_accessories": "Unpair Bridges / Cameras / TVs / External Accessories",
@@ -296,28 +283,19 @@
     "status.homebridge.label_checking_for_updates": "Преверява се за актуализация…",
     "status.homebridge.label_up_to_date": "Актуален",
     "status.homebridge.label_update_available": "{{latestVersion}} налична актуализация",
-    "status.homebridge.label_version": "Версия",
     "status.memory.label_available": "Свободна",
     "status.memory.label_total": "Общо",
-    "status.memory.label_used": "Заета",
     "status.memory.title_memory": "Рам Памет",
     "status.message_code_scan_instructions": "Сканирайте този код с камерата на вашето iOS устройство, за да го добавите към Apple Home.",
     "status.network.label_received_per_second": "Received",
     "status.network.label_sent_per_second": "Sent",
     "status.network.title_network": "Network Activity",
     "status.plugin_out_of_date": "Добавката е остаряла",
     "status.plugins_out_of_date": "Добавките са остарели",
-    "status.services.label_console": "Конзола",
-    "status.services.label_listening_on_port": "Слуша на порт {{port}}",
     "status.services.label_not_running": "Не работи",
     "status.services.label_running": "Работи",
     "status.services.label_running_on_port": "Работи на порт {{port}}",
     "status.services.label_starting": "Starting…",
-    "status.services.title_services": "Услуги",
-    "status.title_server_status": "Статус на сървъра",
-    "status.uptime.label_days": "Дни",
-    "status.uptime.label_hours": "Часове",
-    "status.uptime.label_minutes": "Минути",
     "status.uptime.title_uptime": "Време на работа",
     "status.widget.accessories.label_choose_accessories_to_display": "Choose the Accessories to display in this widget from the Accessories tab.",
     "status.widget.add.label_homebridge_status": "Homebridge Status",
@@ -342,14 +320,12 @@
     "status.widget.label_temperature_units_fahrenheit": "Fahrenheit",
     "status.widget.label_temperature_units_system_default": "System Default",
     "status.widget.label_unlock_layout": "Unlock Layout",
-    "status.widget.label_widget_has_no_options": "This widget has no options",
     "status.widget.systeminfo.label_config_path": "Config Path",
     "status.widget.systeminfo.label_docker": "Docker",
     "status.widget.systeminfo.label_hostname": "Hostname",
     "status.widget.systeminfo.label_ipv4": "IPv4",
     "status.widget.systeminfo.label_ipv6": "IPv6",
     "status.widget.systeminfo.label_nodejs_version": "Node.js Version",
-    "status.widget.systeminfo.label_npm_version": "Npm version",
     "status.widget.systeminfo.label_os": "OS",
     "status.widget.systeminfo.label_plugin_path": "Plugin Path",
     "status.widget.systeminfo.label_service_mode": "Service Mode",
@@ -393,7 +369,6 @@
     "users.toast_added_new_user": "Добавен е нов потребител",
     "users.toast_failed_to_add_user": "Неуспешно добавяне на потребител",
     "users.toast_failed_to_delete_user": "Неуспешно изтриване на потребителя",
-    "users.toast_failed_to_update_user": "Неуспешно обновяване на потребителя",
     "users.toast_updated_user": "Потребителя е обновен",
     "users.toast_user_deleted": "Потребителя е изтрит"
-}
+}