GPII · amb26 · Aug 7, 2018 · Jul 31, 2017 · Jul 31, 2017 · Aug 2, 2017
diff --git a/gpii/node_modules/matchMakerFramework/test/data/os_win7.json b/gpii/node_modules/matchMakerFramework/test/data/os_win7.json
diff --git a/gpii/node_modules/matchMakerFramework/test/inverseCapabilities/os_win7_expected.json b/gpii/node_modules/matchMakerFramework/test/inverseCapabilities/os_win7_expected.json
diff --git a/gpii/node_modules/processReporter/src/processesBridge.js b/gpii/node_modules/processReporter/src/processesBridge.js
diff --git a/gpii/node_modules/processReporter/test/web/js/ProcessesBridgeTests.js b/gpii/node_modules/processReporter/test/web/js/ProcessesBridgeTests.js
diff --git a/testData/deviceReporter/acceptanceTests/win7_builtIn.json b/testData/deviceReporter/acceptanceTests/win7_builtIn.json
@@ -49,6 +49,10 @@
 
     {
         "id": "com.microsoft.windows.typingEnhancement"
+    },
+
+    {
+        "id": "com.microsoft.windows.language"
     }
 
 ]
diff --git a/testData/deviceReporter/installedSolutions.json b/testData/deviceReporter/installedSolutions.json
@@ -91,6 +91,10 @@
         "id": "com.microsoft.windows.typingEnhancement"
     },
 
+    {
+        "id": "com.microsoft.windows.language"
+    },
+
     {
         "id": "com.android.activitymanager"
     },

diff --git a/testData/preferences/catalina.json5 b/testData/preferences/catalina.json5
@@ -0,0 +1,19 @@
+//# catalina
+//
+//This preference set sets the OS language to Spanish (Spain), es-ES.
+//
+//## Testing
+//
+//For this to work correctly, the es-ES language pack needs to be installed on Windows. See GPII-2212.
+{
+    "flat": {
+        "contexts": {
+            "gpii-default": {
+                "name": "Default preferences",
+                "preferences": {
+                    "http://registry.gpii.net/common/language": "es-ES"
+                }
+            }
+        }
+    }
+}
diff --git a/testData/preferences/telugu.json5 b/testData/preferences/telugu.json5
@@ -0,0 +1,19 @@
+//# telugu
+//
+//This preference set sets the OS language to Telugu, te-IN.
+//
+//## Testing
+//
+//For this to work correctly, the te-IN language pack needs to be installed on Windows. See GPII-2212.
+{
+    "flat": {
+        "contexts": {
+            "gpii-default": {
+                "name": "Default preferences",
+                "preferences": {
+                    "http://registry.gpii.net/common/language": "te-IN"
+                }
+            }
+        }
+    }
+}
diff --git a/testData/preferences/tom.json5 b/testData/preferences/tom.json5
@@ -0,0 +1,15 @@
+//# tom
+//
+//This preference set sets the OS language to English (US), en-US.
+{
+    "flat": {
+        "contexts": {
+            "gpii-default": {
+                "name": "Default preferences",
+                "preferences": {
+                    "http://registry.gpii.net/common/language": "en-US"
+                }
+            }
+        }
+    }
+}
diff --git a/testData/solutions/solutionsDescription/com_microsoft_windows_language.md b/testData/solutions/solutionsDescription/com_microsoft_windows_language.md
@@ -0,0 +1,28 @@
+# Windows Display Language
+
+## Details
+
+* __Name__: Windows Display Language
+* __Id__: com.microsoft.windows.language
+* __Platform__: Windows
+* __Contact__: Steve Grundell <sgrundell@raisingthefloor.org>
+
+## Description
+
+Sets the display language of the operating system, by changing some values in the Windows Registry. The new setting
+is only applied to new processes; only Windows Explorer is restarted by this solution.
+
+The language identifier is specified in `http://registry.gpii.net/common/language`.
+
+
+## Testing
+
+The following test users make use of the language setting:
+
+* Tom: English (US), en-US
+* Catalina: Spanish (Spain), es-ES
+* Telegu: Telegu (India), te-IN.
+
+## Limitations
+
+* The appropriate language pack must already be installed.
diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5
@@ -1007,7 +1007,6 @@
         ]
     },
 
-
     "com.microsoft.windows.narrator": {
         "name": "Windows Built-in Narrator",
         "contexts": {
@@ -1264,6 +1263,89 @@
         ]
     },
 
+    "com.microsoft.windows.language": {
+        "name": "Windows Display Language",
+        "contexts": {
+            "OS": [
+                {
+                    "id": "win32",
+                    "version": ">=5.0"
+                }
+            ]
+        },
+        "settingsHandlers": {
+            "configure1": {
+                "type": "gpii.windows.registrySettingsHandler",
+                "options": {
+                    "hKey": "HKEY_CURRENT_USER",
+                    "path": "Control Panel\\Desktop\\MuiCached",
+                    "dataTypes": {
+                        "MachinePreferredUILanguages": "REG_SZ"
+                    }
+                },
+                "capabilities": [
+                    "http://registry\\.gpii\\.net/common/language"
+                ],
+                "capabilitiesTransformations": {
+                    "MachinePreferredUILanguages": {
+                        "transform": {
+                            "type": "fluid.transforms.value",
+                            "inputPath": "http://registry\\.gpii\\.net/common/language"
+                        }
+                    }
+                },
+                "supportedSettings": {
+                    "MachinePreferredUILanguages": {}
+                }
+            },
+            "configure2": {
+                "type": "gpii.windows.registrySettingsHandler",
+                "options": {
+                    "hKey": "HKEY_CURRENT_USER",
+                    "path": "Control Panel\\Desktop",
+                    "dataTypes": {
+                        "PreferredUILanguages": "REG_SZ"
+                    }
+                },
+                "capabilities": [
+                    "http://registry\\.gpii\\.net/common/language"
+                ],
+                "capabilitiesTransformations": {
+                    "PreferredUILanguages": {
+                        "transform": {
+                            "type": "fluid.transforms.value",
+                            "inputPath": "http://registry\\.gpii\\.net/common/language"
+                        }
+                    }
+                },
+                "supportedSettings": {
+                    "PreferredUILanguages": {}
+                }
+            }
+        },
+        "configure": [
+            "settings.configure1",
+            "settings.configure2",
+            {
+                "type": "gpii.windows.updateLanguage",
+                "currentLanguage": "${{registry}.HKEY_CURRENT_USER\\Control Panel\\Desktop\\PreferredUILanguages}"
+            }
+        ],
+        "restore": [
+            "settings.configure1",
+            "settings.configure2",
+            {
+                "type": "gpii.windows.updateLanguage",
+                "currentLanguage": "${{registry}.HKEY_CURRENT_USER\\Control Panel\\Desktop\\PreferredUILanguages}"
+            }
+        ],
+        "isInstalled": [
+            {
+                "type": "gpii.deviceReporter.alwaysInstalled"
+            }
+        ]
+    },
+
     "org.nvda-project": {
         "name": "NVDA Screen Reader",
         "contexts": {

diff --git a/tests/data/preferences/os_win7.json5 b/tests/data/preferences/os_win7.json5
@@ -106,6 +106,10 @@
                         "EnableShiftLock": 1,
                         "EnableCompatibilityKeyboard": 1,
                         "EnableDesktopModeAutoInvoke": 1
+                    },
+                    "http://registry.gpii.net/applications/com.microsoft.windows.language": {
+                        "MachinePreferredUILanguages": "en-US",
+                        "PreferredUILanguages": "en-US"
                     }
                 }
             }

diff --git a/tests/platform/windows/windows-builtIn-testSpec.js b/tests/platform/windows/windows-builtIn-testSpec.js
@@ -289,7 +289,30 @@ gpii.tests.windows.builtIn = [
                         }
                     }
                 }
-            ]
+                ],
+                "com.microsoft.windows.language": [{
+                    "settings": {
+                        "PreferredUILanguages": "en-US"
+                    },
+                    "options": {
+                        "hKey": "HKEY_CURRENT_USER",
+                        "path": "Control Panel\\Desktop",
+                        "dataTypes": {
+                            "PreferredUILanguages": "REG_SZ"
+                        }
+                    }
+                }, {
+                    "settings": {
+                        "MachinePreferredUILanguages": "en-US"
+                    },
+                    "options": {
+                        "hKey": "HKEY_CURRENT_USER",
+                        "path": "Control Panel\\Desktop\\MuiCached",
+                        "dataTypes": {
+                            "MachinePreferredUILanguages": "REG_SZ"
+                        }
+                    }
+                }]
             },
             "gpii.windows.displaySettingsHandler": {
                 "com.microsoft.windows.screenResolution": [{
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,10 @@ @@
         {
             "id": "com.microsoft.windows.typingEnhancement"
+        },
+        {
+            "id": "com.microsoft.windows.language"
         }
     ]