Adjustments (#24254)

microsoft · Feb 22, 2023 · d122f7f · d122f7f
1 parent 995fd2e
commit d122f7f
Show file tree

Hide file tree

Showing 11 changed files with 1,458 additions and 1,517 deletions.
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -87,7 +87,6 @@ ARPPRODUCTICON
 ARRAYSIZE
 arsinh
 artanh
-Artsakh
 asdf
 AShortcut
 ASingle
@@ -180,6 +179,7 @@ BUTTONUP
 BValue
 BYPOSITION
 bytearray
+Cabo
 Caiguna
 CALG
 callbackptr
@@ -401,9 +401,9 @@ deu
 devblogs
 devdocs
 devenum
+devmgmt
 DEVMON
 devpkey
-devmgmt
 DEVSOURCE
 DIIRFLAG
 dimm
@@ -652,8 +652,8 @@ HCRYPTHASH
 HCRYPTPROV
 hcwhite
 hdc
-hdwwiz
 hdrop
+hdwwiz
 HEB
 Heiko
 Helpline
@@ -826,6 +826,7 @@ Ittoqqortoormiit
 IUI
 IUnknown
 ivirtualdesktopmanager
+Ivoire
 IWbem
 IWIC
 iwr
@@ -1385,8 +1386,8 @@ prevpane
 prgms
 pri
 Primorsky
-printmanagement
 PRINTCLIENT
+printmanagement
 prm
 proactively
 PROCESSKEY
@@ -1691,8 +1692,8 @@ spam
 spdisp
 spdlog
 spdo
-spec'ing
 specialfolder
+spec'ing
 spesi
 splitwstring
 spsi
@@ -2132,13 +2133,14 @@ WVC
 Wwan
 Wwanpp
 XAttribute
+XAxis
 Xbox
 XBUTTON
 XBUTTONDBLCLK
 XBUTTONDOWN
 XBUTTONUP
-xcopy
 XControl
+xcopy
 XDocument
 XElement
 XFile
@@ -2152,6 +2154,7 @@ xsi
 XStr
 XVIRTUALSCREEN
 Yamalia
+YAxis
 YIncrement
 yinle
 yinwang

diff --git a/doc/devdocs/modules/launcher/plugins/timeZone.md b/doc/devdocs/modules/launcher/plugins/timeZone.md
@@ -32,7 +32,7 @@ A minimum entry for the `TimeZone.json` looks like:
 ```json
   {
     "Offset": "11:55",
-    "Name": "My crazy time zone",
+    "Name": "My unique time zone",
   }
 ```
 
@@ -41,26 +41,26 @@ A full entry for the `TimeZone.json` looks like:
 ```json
   {
     "Offset": "11:55",
-    "Name": "My crazy time zone",
+    "Name": "My unique time zone",
     "Shortcut" : "MYTZ",
     "MilitaryName" : "Order Time Zone",
     "TimeNamesStandard": [
-        "My crazy standard time"
+        "My unique standard time"
     ],
     "ShortcutsStandard": [
         "MCST"
     ],
     "TimeNamesDaylight": [
-        "My crazy daylight time"
+        "My unique daylight time"
     ],
     "ShortcutsDaylight": [
         "MCDT"
     ],
     "CountriesStandard": [
-      "Crazy Land East"
+      "unique Land East"
     ],
     "CountriesDaylight": [
-      "Crazy Land West"
+      "Unique Land West"
     ]
   }
 ```
@@ -138,4 +138,4 @@ Because the JSON file must have a object as root type, instead of a array.
 #### Projects
 
 * `Wox.Infrastructure`
-* `Wox.Plugin`
+* `Wox.Plugin`
diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp b/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp
@@ -37,8 +37,8 @@ namespace JsonUtils
                 for (uint32_t i = 0; i < size; ++i)
                 {
                     json::JsonObject zoneJson = zonesJson.GetObjectAt(i);
-                    const int x = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XID));
-                    const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YID));
+                    const int x = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XAxisID));
+                    const int y = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YAxisID));
                     const int width = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::WidthID));
                     const int height = static_cast<int>(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::HeightID));
                     FancyZonesDataTypes::CanvasLayoutInfo::Rect zone{ x, y, width, height };

diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h b/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h
@@ -30,8 +30,8 @@ namespace NonLocalizable
         const static wchar_t* RefHeightID = L"ref-height";
         const static wchar_t* RefWidthID = L"ref-width";
         const static wchar_t* ZonesID = L"zones";
-        const static wchar_t* XID = L"X";
-        const static wchar_t* YID = L"Y";
+        const static wchar_t* XAxisID = L"X";
+        const static wchar_t* YAxisID = L"Y";
         const static wchar_t* WidthID = L"width";
         const static wchar_t* HeightID = L"height";
 

diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp b/src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp
@@ -32,16 +32,16 @@ namespace FancyZonesUnitTests
             json::JsonArray zonesArray{};
             {
                 json::JsonObject zone{};
-                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(0));
-                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(0));
+                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(0));
+                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(0));
                 zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(1140));
                 zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(1040));
                 zonesArray.Append(zone);
             }
             {
                 json::JsonObject zone{};
-                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(1140));
-                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(649));
+                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(1140));
+                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(649));
                 zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(780));
                 zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(391));
                 zonesArray.Append(zone);

diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp b/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp
@@ -65,8 +65,8 @@ namespace FancyZonesUnitTests
             for (const auto& zoneRect : zones)
             {
                 json::JsonObject zone{};
-                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(zoneRect.left));
-                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(zoneRect.top));
+                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(zoneRect.left));
+                zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(zoneRect.top));
                 zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(zoneRect.right - zoneRect.left));
                 zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(zoneRect.bottom - zoneRect.top));
                 zonesArray.Append(zone);