deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 01:41:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Set user preferred language

Browse Source
This commit is contained in:
Jay Lee
2021-12-09 15:03:22 -05:00
parent a72ded9079
commit 0d46c1d13a
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -262,7 +262,7 @@ jobs:
for i in {01..10}; do
echo "${newbase}-bulkuser-$i" >> sample.csv;
done
$gam create user $newuser firstname GHA lastname $JID password random recoveryphone 12125121110 recoveryemail jay0lee@gmail.com gha.jid $JID
$gam create user $newuser firstname GHA lastname $JID password random recoveryphone 12125121110 recoveryemail jay0lee@gmail.com gha.jid $JID languages en+,en-GB-
$gam user $gam_user sendemail recipient $newuser subject "test message $newbase" message "GHA test message"
$gam user $gam_user sendemail recipient exchange@pdl.jaylee.us subject "test ${tstamp}" message "test message"
$gam create group $newgroup name "GHA $JID group" description "This is a description" isarchived true

32
src/gam/__init__.py
View File

@@ -6693,13 +6693,18 @@ def getUserAttributes(i, cd, updateCmd):
i += 1
continue
for language in sys.argv[i].replace(',', ' ').split():
lang_item = {}
if language[-1] == '+':
language = language[:-1]
lang_item['preference'] = 'preferred'
elif language[-1] == '-':
language = language[:-1]
lang_item['preference'] = 'not_preferred'
if language.lower() in LANGUAGE_CODES_MAP:
appendItemToBodyList(
body, 'languages',
{'languageCode': LANGUAGE_CODES_MAP[language.lower()]})
lang_item['languageCode'] = LANGUAGE_CODES_MAP[language.lower()]
else:
appendItemToBodyList(body, 'languages',
{'customLanguage': language})
lang_item['customLanguage'] = language
appendItemToBodyList(body, 'languages', lang_item)
i += 1
elif myarg == 'gender':
i += 1
@@ -8839,12 +8844,17 @@ def doGetUserInfo(user_email=None):
if 'name' in user and 'familyName' in user['name']:
print(f'Last Name: {user["name"]["familyName"]}')
if 'languages' in user:
up = 'languageCode'
languages = [row[up] for row in user['languages'] if up in row]
if languages:
print(f'Languages: {",".join(languages)}')
up = 'customLanguage'
languages = [row[up] for row in user['languages'] if up in row]
languages = []
for language in user['languages']:
if 'languageCode' in language:
lang = language['languageCode']
if language.get('preference') == 'preferred':
lang += '+'
elif language.get('preference') == 'not_preferred':
lang += '-'
else:
lang = language.get('customLanguage')
languages.append(lang)
if languages:
print(f'Custom Languages: {",".join(languages)}')
if 'isAdmin' in user: