cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update 02_language.dm

Browse Source
This commit is contained in:
Nadyr
2021-04-30 01:11:33 -04:00
committed by GitHub
parent dde4aa05bd
commit 1e0f3485ac
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/client/preference_setup/general/02_language.dm
View File

@@ -23,18 +23,11 @@
if(!islist(pref.alternate_languages)) pref.alternate_languages = list() if(!islist(pref.alternate_languages)) pref.alternate_languages = list()
if(pref.species) if(pref.species)
var/datum/species/S = GLOB.all_species[pref.species] var/datum/species/S = GLOB.all_species[pref.species]
<<<<<<< HEAD
if(S && pref.alternate_languages.len > pref.numlanguage()) //CHOMPEdit
pref.alternate_languages.len = pref.numlanguage() // Truncate to allowed length CHOMPEdit
||||||| parent of 0c51187d69... Merge pull request #10223 from VOREStation/upstream-merge-8030
if(S && pref.alternate_languages.len > S.num_alternate_languages)
pref.alternate_languages.len = S.num_alternate_languages // Truncate to allowed length
=======
if(!istype(S)) if(!istype(S))
return return
if(pref.alternate_languages.len > S.num_alternate_languages) if(pref.alternate_languages.len > pref.numlanguage()) //CHOMPEdit
pref.alternate_languages.len = S.num_alternate_languages // Truncate to allowed length pref.alternate_languages.len = pref.numlanguage() // Truncate to allowed length CHOMPEdit
// Sanitize illegal languages // Sanitize illegal languages
for(var/language in pref.alternate_languages) for(var/language in pref.alternate_languages)
@@ -42,7 +35,6 @@
if((L.flags & RESTRICTED) || (!(language in S.secondary_langs) && !is_lang_whitelisted(pref.client, L))) if((L.flags & RESTRICTED) || (!(language in S.secondary_langs) && !is_lang_whitelisted(pref.client, L)))
pref.alternate_languages -= language pref.alternate_languages -= language
>>>>>>> 0c51187d69... Merge pull request #10223 from VOREStation/upstream-merge-8030
if(isnull(pref.language_prefixes) || !pref.language_prefixes.len) if(isnull(pref.language_prefixes) || !pref.language_prefixes.len)
pref.language_prefixes = config.language_prefixes.Copy() pref.language_prefixes = config.language_prefixes.Copy()
for(var/prefix in pref.language_prefixes) for(var/prefix in pref.language_prefixes)