replace G Suite with Google Workspace

silinternational · Dec 11, 2024 · 7e146df · 7e146df
1 parent b721005
commit 7e146df
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -106,7 +106,7 @@ The personnel component is used to look up informaton about users from your comp
 
 1. Create a project on <https://console.developers.google.com/>.
 2. Still in the Google Developers Console, create a Service Account.
-3. Check "Furnish a new private key" and "Enable G Suite Domain-wide Delegation".
+3. Check "Furnish a new private key" and "Enable Google Workspace Domain-wide Delegation".
 4. Save the JSON file it provides (containing your private key), but **DO NOT**
    store it in public version control (such as in a public GitHub repo).
 5. Enable the "Admin SDK" API for your project in the Google Developers Console.
@@ -136,7 +136,7 @@ The personnel component is used to look up informaton about users from your comp
         'emailFieldName' => 'email',
         'employeeIdFieldName' => 'employee_id',
         'userActiveRecordClass' => '\common\models\User',
-        'displayName' => 'G Suite',
+        'displayName' => 'Google Workspace',
     ]);
 
 For details about what each of those fields is used for, see the documenting

diff --git a/application/common/components/passwordStore/Google.php b/application/common/components/passwordStore/Google.php
@@ -323,7 +323,7 @@ protected function getUserByEmployeeId($employeeId)
                 'employee_id' => $employeeId,
                 'email1' => $response['users'][0]['primaryEmail'],
                 'email2' => $response['users'][1]['primaryEmail'],
-                'error' => 'Multiple email addresses found in G Suite. Cannot resolve.',
+                'error' => 'Multiple email addresses found in Google Workspace. Cannot resolve.',
             ]);
             throw new \Exception(\Yii::t('app', 'Google.MultipleEmailsFound'), 1560875143);
         }

diff --git a/application/common/config/local.php.dist b/application/common/config/local.php.dist
@@ -62,7 +62,7 @@ return [
                 ],
                 [
                     'class' => Google::class,
-                    'displayName' => 'Acme G Suite',
+                    'displayName' => 'Acme Google Workspace',
                     'applicationName' => 'Acme IdP',
                     'jsonAuthFilePath' => '/data/google.json',
                     'delegatedAdminEmail' => '[email protected]',

diff --git a/application/frontend/messages/en/app.php b/application/frontend/messages/en/app.php
@@ -19,8 +19,8 @@
 return [
     'and' => 'and',
     'Auth.MissingClientID' => 'Client ID is missing',
-    'Google.EmployeeIdNotFound' => 'Employee ID not found in G Suite',
-    'Google.MultipleEmailsFound' => 'Multiple email addresses found in G Suite. Cannot resolve.',
+    'Google.EmployeeIdNotFound' => 'Employee ID not found in Google Workspace',
+    'Google.MultipleEmailsFound' => 'Multiple email addresses found in Google Workspace. Cannot resolve.',
     'Method.AlreadyExists' => 'Recovery method already exists',
     'Method.CodeExpired' => 'Expired verification code',
     'Method.CodeMissing' => 'Code is required',

diff --git a/application/frontend/messages/es/app.php b/application/frontend/messages/es/app.php
@@ -19,8 +19,8 @@
 return [
     'and' => 'y',
     'Auth.MissingClientID' => 'Falta el ID del cliente',
-    'Google.EmployeeIdNotFound' => 'ID de empleado no encontrado en la G Suite',
-    'Google.MultipleEmailsFound' => 'Se encuentran varias direcciones de correo electrónico en G Suite. No se puede resolver.',
+    'Google.EmployeeIdNotFound' => 'ID de empleado no encontrado en la Google Workspace',
+    'Google.MultipleEmailsFound' => 'Se encuentran varias direcciones de correo electrónico en Google Workspace. No se puede resolver.',
     'Method.AlreadyExists' => 'El método de pago ya existe',
     'Method.CodeExpired' => 'Código de verificación vencido',
     'Method.CodeMissing' => 'Es necesario un código',

diff --git a/application/frontend/messages/fr/app.php b/application/frontend/messages/fr/app.php
@@ -19,8 +19,8 @@
 return [
     'and' => 'et',
     'Auth.MissingClientID' => 'Client ID est manquant',
-    'Google.EmployeeIdNotFound' => 'ID de l\'employé non trouvé dans la G Suite',
-    'Google.MultipleEmailsFound' => 'Plusieurs adresses e-mail trouvées dans G Suite. Impossible à résoudre.',
+    'Google.EmployeeIdNotFound' => 'ID de l\'employé non trouvé dans la Google Workspace',
+    'Google.MultipleEmailsFound' => 'Plusieurs adresses e-mail trouvées dans Google Workspace. Impossible à résoudre.',
     'Method.AlreadyExists' => 'La méthode de récupération existe déjà',
     'Method.CodeExpired' => 'Code de vérification invalide',
     'Method.CodeMissing' => 'Code est requis',

diff --git a/application/frontend/messages/ko/app.php b/application/frontend/messages/ko/app.php
@@ -19,8 +19,8 @@
 return [
     'and' => '및',
     'Auth.MissingClientID' => '클라이언트 ID가 없습니다.',
-    'Google.EmployeeIdNotFound' => 'G Suite 에 직원 ID가 없습니다.',
-    'Google.MultipleEmailsFound' => 'G Suite 에 여러 이메일 주소가 있습니다. 해결할 수 없습니다.',
+    'Google.EmployeeIdNotFound' => 'Google Workspace 에 직원 ID가 없습니다.',
+    'Google.MultipleEmailsFound' => 'Google Workspace 에 여러 이메일 주소가 있습니다. 해결할 수 없습니다.',
     'Method.AlreadyExists' => '복구 방법이 이미 있습니다.',
     'Method.CodeExpired' => '만료 된 인증 코드',
     'Method.CodeMissing' => '코드가 필요합니다.',