codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-13 22:49:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #2329: ordered spoken languages first by popularity (for top 8), then by alphabetical.

Browse source
This commit is contained in:
Nick Winter 2015-02-17 09:29:08 -08:00
parent 5c91c7a237
commit ae07a25657
7 changed files with 41 additions and 1325 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1285
app/locale/en-AU.coffee
View file

File diff suppressed because it is too large Load diff

70
app/locale/locale.coffee
View file

@ -15,51 +15,51 @@ module.exports =
'en': { nativeDescription: 'English', englishDescription: 'English' }
'en-US': { nativeDescription: 'English (US)', englishDescription: 'English (US)' }
'en-GB': { nativeDescription: 'English (UK)', englishDescription: 'English (UK)' }
'en-AU': { nativeDescription: 'English (AU)', englishDescription: 'English (AU)' }
'zh-HANS': { nativeDescription: '简体中文', englishDescription: 'Chinese (Simplified)' }
'zh-HANT': { nativeDescription: '繁体中文', englishDescription: 'Chinese (Traditional)' }
'ru': { nativeDescription: 'русский', englishDescription: 'Russian' }
'es-ES': { nativeDescription: 'español (ES)', englishDescription: 'Spanish (Spain)' }
'es-419': { nativeDescription: 'español (América Latina)', englishDescription: 'Spanish (Latin America)' }
'fr': { nativeDescription: 'français', englishDescription: 'French' }
# Begin alphabetized list: https://github.com/codecombat/codecombat/issues/2329#issuecomment-74630546
'ar': { nativeDescription: 'العربية', englishDescription: 'Arabic' }
'bg': { nativeDescription: 'български език', englishDescription: 'Bulgarian' }
'ca': { nativeDescription: 'Català', englishDescription: 'Catalan' }
'cs': { nativeDescription: 'čeština', englishDescription: 'Czech' }
'da': { nativeDescription: 'dansk', englishDescription: 'Danish' }
'de-DE': { nativeDescription: 'Deutsch (Deutschland)', englishDescription: 'German (Germany)' }
'de-AT': { nativeDescription: 'Deutsch (Österreich)', englishDescription: 'German (Austria)' }
'de-CH': { nativeDescription: 'Deutsch (Schweiz)', englishDescription: 'German (Switzerland)' }
'es-419': { nativeDescription: 'español (América Latina)', englishDescription: 'Spanish (Latin America)' }
'es-ES': { nativeDescription: 'español (ES)', englishDescription: 'Spanish (Spain)' }
'zh-HANS': { nativeDescription: '简体中文', englishDescription: 'Chinese (Simplified)' }
'zh-HANT': { nativeDescription: '繁体中文', englishDescription: 'Chinese (Traditional)' }
'zh-WUU-HANS': { nativeDescription: '吴语', englishDescription: 'Wuu (Simplified)' }
'zh-WUU-HANT': { nativeDescription: '吳語', englishDescription: 'Wuu (Traditional)' }
'fr': { nativeDescription: 'français', englishDescription: 'French' }
'ja': { nativeDescription: '日本語', englishDescription: 'Japanese' }
'ar': { nativeDescription: 'العربية', englishDescription: 'Arabic' }
'pt-BR': { nativeDescription: 'português do Brasil', englishDescription: 'Portuguese (Brazil)' }
'pt-PT': { nativeDescription: 'Português (Portugal)', englishDescription: 'Portuguese (Portugal)' }
'pl': { nativeDescription: 'język polski', englishDescription: 'Polish' }
'el': { nativeDescription: 'Ελληνικά', englishDescription: 'Greek' }
'fa': { nativeDescription: 'فارسی', englishDescription: 'Persian' }
'gl': { nativeDescription: 'Galego', englishDescription: 'Galician' }
'ko': { nativeDescription: '한국어', englishDescription: 'Korean' }
'id': { nativeDescription: 'Bahasa Indonesia', englishDescription: 'Indonesian' }
'it': { nativeDescription: 'Italiano', englishDescription: 'Italian' }
'tr': { nativeDescription: 'Türkçe', englishDescription: 'Turkish' }
'he': { nativeDescription: 'עברית', englishDescription: 'Hebrew' }
'hu': { nativeDescription: 'magyar', englishDescription: 'Hungarian' }
'lt': { nativeDescription: 'lietuvių kalba', englishDescription: 'Lithuanian' }
'mk-MK': { nativeDescription: 'Македонски', englishDescription: 'Macedonian' }
'hi': { nativeDescription: 'मानक हिन्दी', englishDescription: 'Hindi' }
'ms': { nativeDescription: 'Bahasa Melayu', englishDescription: 'Bahasa Malaysia' }
'nl-BE': { nativeDescription: 'Nederlands (België)', englishDescription: 'Dutch (Belgium)' }
'nl-NL': { nativeDescription: 'Nederlands (Nederland)', englishDescription: 'Dutch (Netherlands)' }
'fa': { nativeDescription: 'فارسی', englishDescription: 'Persian' }
'cs': { nativeDescription: 'čeština', englishDescription: 'Czech' }
'sv': { nativeDescription: 'Svenska', englishDescription: 'Swedish' }
'id': { nativeDescription: 'Bahasa Indonesia', englishDescription: 'Indonesian' }
'el': { nativeDescription: 'Ελληνικά', englishDescription: 'Greek' }
'ja': { nativeDescription: '日本語', englishDescription: 'Japanese' }
'nb': { nativeDescription: 'Norsk Bokmål', englishDescription: 'Norwegian (Bokmål)' }
'nn': { nativeDescription: 'Norsk Nynorsk', englishDescription: 'Norwegian (Nynorsk)' }
'pl': { nativeDescription: 'język polski', englishDescription: 'Polish' }
'pt-PT': { nativeDescription: 'Português (Portugal)', englishDescription: 'Portuguese (Portugal)' }
'pt-BR': { nativeDescription: 'português do Brasil', englishDescription: 'Portuguese (Brazil)' }
'ro': { nativeDescription: 'limba română', englishDescription: 'Romanian' }
'vi': { nativeDescription: 'Tiếng Việt', englishDescription: 'Vietnamese' }
'hu': { nativeDescription: 'magyar', englishDescription: 'Hungarian' }
'th': { nativeDescription: 'ไทย', englishDescription: 'Thai' }
'da': { nativeDescription: 'dansk', englishDescription: 'Danish' }
'ko': { nativeDescription: '한국어', englishDescription: 'Korean' }
'sr': { nativeDescription: 'српски', englishDescription: 'Serbian' }
'sk': { nativeDescription: 'slovenčina', englishDescription: 'Slovak' }
'sl': { nativeDescription: 'slovenščina', englishDescription: 'Slovene' }
'fi': { nativeDescription: 'suomi', englishDescription: 'Finnish' }
'bg': { nativeDescription: 'български език', englishDescription: 'Bulgarian' }
'nb': { nativeDescription: 'Norsk Bokmål', englishDescription: 'Norwegian (Bokmål)' }
'nn': { nativeDescription: 'Norsk Nynorsk', englishDescription: 'Norwegian (Nynorsk)' }
'he': { nativeDescription: 'עברית', englishDescription: 'Hebrew' }
'lt': { nativeDescription: 'lietuvių kalba', englishDescription: 'Lithuanian' }
'sr': { nativeDescription: 'српски', englishDescription: 'Serbian' }
'sv': { nativeDescription: 'Svenska', englishDescription: 'Swedish' }
'th': { nativeDescription: 'ไทย', englishDescription: 'Thai' }
'tr': { nativeDescription: 'Türkçe', englishDescription: 'Turkish' }
'uk': { nativeDescription: 'українська мова', englishDescription: 'Ukrainian' }
'hi': { nativeDescription: 'मानक हिन्दी', englishDescription: 'Hindi' }
'ur': { nativeDescription: 'اُردُو', englishDescription: 'Urdu' }
'ms': { nativeDescription: 'Bahasa Melayu', englishDescription: 'Bahasa Malaysia' }
'ca': { nativeDescription: 'Català', englishDescription: 'Catalan' }
'gl': { nativeDescription: 'Galego', englishDescription: 'Galician' }
'mk-MK': { nativeDescription: 'Македонски', englishDescription: 'Macedonian' }
'vi': { nativeDescription: 'Tiếng Việt', englishDescription: 'Vietnamese' }
'zh-WUU-HANS': { nativeDescription: '吴语', englishDescription: 'Wuu (Simplified)' }
'zh-WUU-HANT': { nativeDescription: '吳語', englishDescription: 'Wuu (Traditional)' }

2
app/models/LevelSession.coffee
View file

@ -31,7 +31,7 @@ module.exports = class LevelSession extends CocoModel
return false unless team = @get('team')
return true unless c2 = @get('submittedCode')
thangSpellArr = (s.split('/') for s in @get('teamSpells')[team])
for item in thangSpellArr
for item in thangSpellAr
thang = item[0]
spell = item[1]
return true if c1[thang][spell] isnt c2[thang]?[spell]

2
app/styles/common/site-chrome.sass
View file

@ -70,7 +70,7 @@
text-transform: uppercase
font-family: $headings-font-family
margin: 0 7px
button, select
position: relative
top: -3px

2
app/views/contribute/DiplomatView.coffee
View file

@ -5,7 +5,6 @@ template = require 'templates/contribute/diplomat'
require("locale/en")
require("locale/en-US")
require("locale/en-GB")
require("locale/en-AU")
require("locale/ru")
require("locale/de-DE")
require("locale/de-AT")
@ -91,7 +90,6 @@ module.exports = class DiplomatView extends ContributeClassView
en: [] # English - English
'en-US': [] # English (US), English (US)
'en-GB': [] # English (UK), English (UK)
'en-AU': [] # English (AU), English (AU)
ru: ['fess89', 'ser-storchak', 'Mr A', 'a1ip', 'iulianR', 'EagleTA', 'kisik21', 'Shpionus', 'kerradus', 'ImmortalJoker', 'nixel'] # русский язык, Russian
'de-DE': ['Dirk', 'faabsen', 'HiroP0', 'Anon', 'bkimminich', 'bahuma20', 'domenukk', 'dkundel', 'djsmith85'] # Deutsch (Deutschland), German (Germany)
'de-AT': ['djsmith85'] # Deutsch (Österreich), German (Austria)

3
app/views/core/RootView.coffee
View file

@ -139,6 +139,9 @@ module.exports = class RootView extends CocoView
for code, localeInfo of locale when not (code in genericCodes) or code is initialVal
$select.append(
$('<option></option>').val(code).text(localeInfo.nativeDescription))
if code is 'fr'
$select.append(
$('<option class="select-dash" disabled="disabled"></option>').text('----------------------------------'))
$select.val(initialVal)
onLanguageChanged: ->

2
server/commons/Handler.coffee
View file

@ -53,7 +53,7 @@ module.exports = class Handler
return false unless delta.o.length is 1
index = delta.deltaPath.indexOf('i18n')
return false if index is -1
return false if delta.deltaPath[index+1] in ['en', 'en-US', 'en-GB', 'en-AU'] # English speakers are most likely just spamming, so always treat those as patches, not saves.
return false if delta.deltaPath[index+1] in ['en', 'en-US', 'en-GB'] # English speakers are most likely just spamming, so always treat those as patches, not saves.
return true
formatEntity: (req, document) -> document?.toObject()