Merge 83377d98a0 into c136e5e8bd

.github/copilot-instructions.md

@@ -0,0 +1,2 @@
+Never write strings in the frontend directly, always write to and reference the relevant translations file.
+Always conform new and refactored code to the existing coding style in the project.

docs/docs/configuration/masks.md

@@ -28,7 +28,6 @@ To create a poly mask:
 5. Click the plus icon under the type of mask or zone you would like to create
 6. Click on the camera's latest image to create the points for a masked area. Click the first point again to close the polygon.
 7. When you've finished creating your mask, press Save.
-8. Restart Frigate to apply your changes.
 
 Your config file will be updated with the relative coordinates of the mask/zone:
 

docs/docs/configuration/reference.md

@@ -1002,10 +1002,6 @@ ui:
   #    full: 8:15:22 PM Mountain Standard Time
   # (default: shown below).
   time_style: medium
-  # Optional: Ability to manually override the date / time styling to use strftime format
-  # https://www.gnu.org/software/libc/manual/html_node/Formatting-Calendar-Time.html
-  # possible values are shown above (default: not set)
-  strftime_fmt: "%Y/%m/%d %H:%M"
   # Optional: Set the unit system to either "imperial" or "metric" (default: metric)
   # Used in the UI and in MQTT topics
   unit_system: metric

frigate/config/ui.py

@@ -37,9 +37,6 @@ class UIConfig(FrigateBaseModel):
     time_style: DateTimeStyleEnum = Field(
         default=DateTimeStyleEnum.medium, title="Override UI timeStyle."
     )
-    strftime_fmt: Optional[str] = Field(
-        default=None, title="Override date and time format using strftime syntax."
-    )
     unit_system: UnitSystemEnum = Field(
         default=UnitSystemEnum.metric, title="The unit system to use for measurements."
     )

web/public/locales/en/config/ui.json

@@ -13,11 +13,8 @@
     "time_style": {
       "label": "Override UI timeStyle."
     },
-    "strftime_fmt": {
-      "label": "Override date and time format using strftime syntax."
-    },
     "unit_system": {
       "label": "The unit system to use for measurements."
     }
   }
-}
+}

web/public/locales/en/views/classificationModel.json

@@ -1,5 +1,5 @@
 {
-  "documentTitle": "Classification Models",
+  "documentTitle": "Classification Models - Frigate",
   "details": {
     "scoreInfo": "Score represents the average classification confidence across all detections of this object."
   },

web/public/locales/en/views/explore.json

@@ -77,7 +77,7 @@
         "millisecondsToOffset": "Milliseconds to offset detect annotations by. <em>Default: 0</em>",
         "tips": "Lower the value if the video playback is ahead of the boxes and path points, and increase the value if the video playback is behind them. This value can be negative.",
         "toast": {
-          "success": "Annotation offset for {{camera}} has been saved to the config file. Restart Frigate to apply your changes."
+          "success": "Annotation offset for {{camera}} has been saved to the config file."
         }
       }
     },

web/public/locales/en/views/settings.json

@@ -534,7 +534,7 @@
         }
       },
       "toast": {
-        "success": "Zone ({{zoneName}}) has been saved. Restart Frigate to apply changes."
+        "success": "Zone ({{zoneName}}) has been saved."
       }
     },
     "motionMasks": {
@@ -558,8 +558,8 @@
       },
       "toast": {
         "success": {
-          "title": "{{polygonName}} has been saved. Restart Frigate to apply changes.",
+          "title": "{{polygonName}} has been saved.",
-          "noName": "Motion Mask has been saved. Restart Frigate to apply changes."
+          "noName": "Motion Mask has been saved."
         }
       }
     },
@@ -583,8 +583,8 @@
       },
       "toast": {
         "success": {
-          "title": "{{polygonName}} has been saved. Restart Frigate to apply changes.",
+          "title": "{{polygonName}} has been saved.",
-          "noName": "Object Mask has been saved. Restart Frigate to apply changes."
+          "noName": "Object Mask has been saved."
         }
       }
     }

web/src/types/frigateConfig.ts

@@ -6,7 +6,6 @@ export interface UiConfig {
   time_format?: "browser" | "12hour" | "24hour";
   date_style?: "full" | "long" | "medium" | "short";
   time_style?: "full" | "long" | "medium" | "short";
-  strftime_fmt?: string;
   dashboard: boolean;
   order: number;
   unit_system?: "metric" | "imperial";

web/src/views/classification/ModelTrainingView.tsx

@@ -84,6 +84,12 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
   const [page, setPage] = useState<string>("train");
   const [pageToggle, setPageToggle] = useOptimisticState(page, setPage, 100);
 
+  // title
+
+  useEffect(() => {
+    document.title = `${model.name} - ${t("documentTitle")}`;
+  }, [model.name, t]);
+
   // model state
 
   const [wasTraining, setWasTraining] = useState(false);