equal
deleted
inserted
replaced
133 # 1. user specified language |
133 # 1. user specified language |
134 lang = vreg.typed_value('ui.language', |
134 lang = vreg.typed_value('ui.language', |
135 self.user.properties['ui.language']) |
135 self.user.properties['ui.language']) |
136 self.set_language(lang) |
136 self.set_language(lang) |
137 return |
137 return |
138 except KeyError, ex: |
138 except KeyError: |
139 pass |
139 pass |
140 if vreg.config['language-negociation']: |
140 if vreg.config['language-negociation']: |
141 # 2. http negociated language |
141 # 2. http negociated language |
142 for lang in self.header_accept_language(): |
142 for lang in self.header_accept_language(): |
143 if lang in self.translations: |
143 if lang in self.translations: |
669 else: |
669 else: |
670 for score in scores.split(';'): |
670 for score in scores.split(';'): |
671 try: |
671 try: |
672 scorekey, scoreval = score.split('=') |
672 scorekey, scoreval = score.split('=') |
673 if scorekey == 'q': # XXX 'level' |
673 if scorekey == 'q': # XXX 'level' |
674 score = float(score[2:]) # remove 'q=' |
674 score = float(scoreval) |
675 except ValueError: |
675 except ValueError: |
676 continue |
676 continue |
677 values.append((score, value)) |
677 values.append((score, value)) |
678 values.sort(reverse=True) |
678 values.sort(reverse=True) |
679 return (value for (score, value) in values) |
679 return (value for (score, value) in values) |