Skip to content

Commit

Permalink
Apply feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
Zibi Braniecki committed May 18, 2017
1 parent 7feb8ee commit 4fb0ff1
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
10 changes: 10 additions & 0 deletions fluent-langneg/src/accepted_languages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

export default function aceptedLanguages(string = '') {
if (typeof string !== 'string') {
throw new TypeError('Argument must be a string');
}
const tokens = string.split(',').map(t => t.trim());
return tokens.filter(t => t !== '').map(t => {
return t.split(';')[0];
});
}
8 changes: 0 additions & 8 deletions fluent-langneg/src/headers.js

This file was deleted.

1 change: 1 addition & 0 deletions fluent-langneg/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*
*/

export { default as acceptedLanguages } from './accepted_languages';
import filterMatches from './matches';

function GetOption(options, property, type, values, fallback) {
Expand Down
10 changes: 5 additions & 5 deletions fluent-langneg/test/headers_test.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import assert from 'assert';
import parseHeaderIntoArray from '../src/headers';
import acceptedLanguages from '../src/accepted_languages';

suite('parse headers', () => {
test('without quality values', () => {
assert.deepStrictEqual(
parseHeaderIntoArray('en-US, fr, pl'), [
acceptedLanguages('en-US, fr, pl'), [
'en-US',
'fr',
'pl'
]
);
assert.deepStrictEqual(
parseHeaderIntoArray('sr-Latn'), [
acceptedLanguages('sr-Latn'), [
'sr-Latn'
]
);
});

test('with quality values', () => {
assert.deepStrictEqual(
parseHeaderIntoArray('fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'), [
acceptedLanguages('fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'), [
'fr-CH',
'fr',
'en',
Expand All @@ -39,7 +39,7 @@ suite('parse headers', () => {
];

args.forEach(arg => {
assert.throws(parseHeaderIntoArray.bind(null, arg), TypeError);
assert.throws(acceptedLanguages.bind(null, arg), TypeError);
});
});
});

0 comments on commit 4fb0ff1

Please sign in to comment.