react-intl 2.2.1 → 2.4.0

package/src/en.js

@@ -1,2 +1,2 @@
 // GENERATED FILE
-export default {"locale":"en","pluralRuleFunction":function (n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"},"fields":{"year":{"displayName":"year","relative":{"0":"this year","1":"next year","-1":"last year"},"relativeTime":{"future":{"one":"in {0} year","other":"in {0} years"},"past":{"one":"{0} year ago","other":"{0} years ago"}}},"month":{"displayName":"month","relative":{"0":"this month","1":"next month","-1":"last month"},"relativeTime":{"future":{"one":"in {0} month","other":"in {0} months"},"past":{"one":"{0} month ago","other":"{0} months ago"}}},"day":{"displayName":"day","relative":{"0":"today","1":"tomorrow","-1":"yesterday"},"relativeTime":{"future":{"one":"in {0} day","other":"in {0} days"},"past":{"one":"{0} day ago","other":"{0} days ago"}}},"hour":{"displayName":"hour","relativeTime":{"future":{"one":"in {0} hour","other":"in {0} hours"},"past":{"one":"{0} hour ago","other":"{0} hours ago"}}},"minute":{"displayName":"minute","relativeTime":{"future":{"one":"in {0} minute","other":"in {0} minutes"},"past":{"one":"{0} minute ago","other":"{0} minutes ago"}}},"second":{"displayName":"second","relative":{"0":"now"},"relativeTime":{"future":{"one":"in {0} second","other":"in {0} seconds"},"past":{"one":"{0} second ago","other":"{0} seconds ago"}}}}};
+export default {"locale":"en","pluralRuleFunction":function (n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"},"fields":{"year":{"displayName":"year","relative":{"0":"this year","1":"next year","-1":"last year"},"relativeTime":{"future":{"one":"in {0} year","other":"in {0} years"},"past":{"one":"{0} year ago","other":"{0} years ago"}}},"month":{"displayName":"month","relative":{"0":"this month","1":"next month","-1":"last month"},"relativeTime":{"future":{"one":"in {0} month","other":"in {0} months"},"past":{"one":"{0} month ago","other":"{0} months ago"}}},"day":{"displayName":"day","relative":{"0":"today","1":"tomorrow","-1":"yesterday"},"relativeTime":{"future":{"one":"in {0} day","other":"in {0} days"},"past":{"one":"{0} day ago","other":"{0} days ago"}}},"hour":{"displayName":"hour","relative":{"0":"this hour"},"relativeTime":{"future":{"one":"in {0} hour","other":"in {0} hours"},"past":{"one":"{0} hour ago","other":"{0} hours ago"}}},"minute":{"displayName":"minute","relative":{"0":"this minute"},"relativeTime":{"future":{"one":"in {0} minute","other":"in {0} minutes"},"past":{"one":"{0} minute ago","other":"{0} minutes ago"}}},"second":{"displayName":"second","relative":{"0":"now"},"relativeTime":{"future":{"one":"in {0} second","other":"in {0} seconds"},"past":{"one":"{0} second ago","other":"{0} seconds ago"}}}}};

package/src/format.js

@@ -8,268 +8,269 @@ import invariant from 'invariant';
 import IntlRelativeFormat from 'intl-relativeformat';
 
 import {
-    dateTimeFormatPropTypes,
-    numberFormatPropTypes,
-    relativeFormatPropTypes,
-    pluralFormatPropTypes,
+  dateTimeFormatPropTypes,
+  numberFormatPropTypes,
+  relativeFormatPropTypes,
+  pluralFormatPropTypes,
 } from './types';
 
-import {
-    escape,
-    filterProps,
-} from './utils';
+import {escape, filterProps} from './utils';
 
 const DATE_TIME_FORMAT_OPTIONS = Object.keys(dateTimeFormatPropTypes);
-const NUMBER_FORMAT_OPTIONS    = Object.keys(numberFormatPropTypes);
-const RELATIVE_FORMAT_OPTIONS  = Object.keys(relativeFormatPropTypes);
-const PLURAL_FORMAT_OPTIONS    = Object.keys(pluralFormatPropTypes);
+const NUMBER_FORMAT_OPTIONS = Object.keys(numberFormatPropTypes);
+const RELATIVE_FORMAT_OPTIONS = Object.keys(relativeFormatPropTypes);
+const PLURAL_FORMAT_OPTIONS = Object.keys(pluralFormatPropTypes);
 
 const RELATIVE_FORMAT_THRESHOLDS = {
-    second: 60, // seconds to minute
-    minute: 60, // minutes to hour
-    hour  : 24, // hours to day
-    day   : 30, // days to month
-    month : 12, // months to year
+  second: 60, // seconds to minute
+  minute: 60, // minutes to hour
+  hour: 24, // hours to day
+  day: 30, // days to month
+  month: 12, // months to year
 };
 
 function updateRelativeFormatThresholds(newThresholds) {
-    const {thresholds} = IntlRelativeFormat;
-    ({
-        second: thresholds.second,
-        minute: thresholds.minute,
-        hour  : thresholds.hour,
-        day   : thresholds.day,
-        month : thresholds.month,
-    } = newThresholds);
+  const {thresholds} = IntlRelativeFormat;
+  ({
+    second: thresholds.second,
+    minute: thresholds.minute,
+    hour: thresholds.hour,
+    day: thresholds.day,
+    month: thresholds.month,
+  } = newThresholds);
 }
 
 function getNamedFormat(formats, type, name) {
-    let format = formats && formats[type] && formats[type][name];
-    if (format) {
-        return format;
-    }
-
-    if (process.env.NODE_ENV !== 'production') {
-        console.error(
-            `[React Intl] No ${type} format named: ${name}`
-        );
-    }
+  let format = formats && formats[type] && formats[type][name];
+  if (format) {
+    return format;
+  }
+
+  if (process.env.NODE_ENV !== 'production') {
+    console.error(`[React Intl] No ${type} format named: ${name}`);
+  }
 }
 
 export function formatDate(config, state, value, options = {}) {
-    const {locale, formats} = config;
-    const {format}          = options;
-
-    let date            = new Date(value);
-    let defaults        = format && getNamedFormat(formats, 'date', format);
-    let filteredOptions = filterProps(options, DATE_TIME_FORMAT_OPTIONS, defaults);
-
-    try {
-        return state.getDateTimeFormat(locale, filteredOptions).format(date);
-    } catch (e) {
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(
-                `[React Intl] Error formatting date.\n${e}`
-            );
-        }
+  const {locale, formats} = config;
+  const {format} = options;
+
+  let date = new Date(value);
+  let defaults = format && getNamedFormat(formats, 'date', format);
+  let filteredOptions = filterProps(
+    options,
+    DATE_TIME_FORMAT_OPTIONS,
+    defaults
+  );
+
+  try {
+    return state.getDateTimeFormat(locale, filteredOptions).format(date);
+  } catch (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(`[React Intl] Error formatting date.\n${e}`);
     }
+  }
 
-    return String(date);
+  return String(date);
 }
 
 export function formatTime(config, state, value, options = {}) {
-    const {locale, formats} = config;
-    const {format}          = options;
-
-    let date            = new Date(value);
-    let defaults        = format && getNamedFormat(formats, 'time', format);
-    let filteredOptions = filterProps(options, DATE_TIME_FORMAT_OPTIONS, defaults);
-
-    if (!filteredOptions.hour && !filteredOptions.minute && !filteredOptions.second) {
-        // Add default formatting options if hour, minute, or second isn't defined.
-        filteredOptions = { ...filteredOptions, hour: 'numeric', minute: 'numeric'};
-    }
-
-    try {
-        return state.getDateTimeFormat(locale, filteredOptions).format(date);
-    } catch (e) {
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(
-                `[React Intl] Error formatting time.\n${e}`
-            );
-        }
+  const {locale, formats} = config;
+  const {format} = options;
+
+  let date = new Date(value);
+  let defaults = format && getNamedFormat(formats, 'time', format);
+  let filteredOptions = filterProps(
+    options,
+    DATE_TIME_FORMAT_OPTIONS,
+    defaults
+  );
+
+  if (
+    !filteredOptions.hour &&
+    !filteredOptions.minute &&
+    !filteredOptions.second
+  ) {
+    // Add default formatting options if hour, minute, or second isn't defined.
+    filteredOptions = {...filteredOptions, hour: 'numeric', minute: 'numeric'};
+  }
+
+  try {
+    return state.getDateTimeFormat(locale, filteredOptions).format(date);
+  } catch (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(`[React Intl] Error formatting time.\n${e}`);
     }
+  }
 
-    return String(date);
+  return String(date);
 }
 
 export function formatRelative(config, state, value, options = {}) {
-    const {locale, formats} = config;
-    const {format}          = options;
-
-    let date            = new Date(value);
-    let now             = new Date(options.now);
-    let defaults        = format && getNamedFormat(formats, 'relative', format);
-    let filteredOptions = filterProps(options, RELATIVE_FORMAT_OPTIONS, defaults);
-
-    // Capture the current threshold values, then temporarily override them with
-    // specific values just for this render.
-    const oldThresholds = {...IntlRelativeFormat.thresholds};
-    updateRelativeFormatThresholds(RELATIVE_FORMAT_THRESHOLDS);
-
-    try {
-        return state.getRelativeFormat(locale, filteredOptions).format(date, {
-            now: isFinite(now) ? now : state.now(),
-        });
-    } catch (e) {
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(
-                `[React Intl] Error formatting relative time.\n${e}`
-            );
-        }
-    } finally {
-        updateRelativeFormatThresholds(oldThresholds);
+  const {locale, formats} = config;
+  const {format} = options;
+
+  let date = new Date(value);
+  let now = new Date(options.now);
+  let defaults = format && getNamedFormat(formats, 'relative', format);
+  let filteredOptions = filterProps(options, RELATIVE_FORMAT_OPTIONS, defaults);
+
+  // Capture the current threshold values, then temporarily override them with
+  // specific values just for this render.
+  const oldThresholds = {...IntlRelativeFormat.thresholds};
+  updateRelativeFormatThresholds(RELATIVE_FORMAT_THRESHOLDS);
+
+  try {
+    return state.getRelativeFormat(locale, filteredOptions).format(date, {
+      now: isFinite(now) ? now : state.now(),
+    });
+  } catch (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(`[React Intl] Error formatting relative time.\n${e}`);
     }
+  } finally {
+    updateRelativeFormatThresholds(oldThresholds);
+  }
 
-    return String(date);
+  return String(date);
 }
 
 export function formatNumber(config, state, value, options = {}) {
-    const {locale, formats} = config;
-    const {format}          = options;
+  const {locale, formats} = config;
+  const {format} = options;
 
-    let defaults        = format && getNamedFormat(formats, 'number', format);
-    let filteredOptions = filterProps(options, NUMBER_FORMAT_OPTIONS, defaults);
+  let defaults = format && getNamedFormat(formats, 'number', format);
+  let filteredOptions = filterProps(options, NUMBER_FORMAT_OPTIONS, defaults);
 
-    try {
-        return state.getNumberFormat(locale, filteredOptions).format(value);
-    } catch (e) {
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(
-                `[React Intl] Error formatting number.\n${e}`
-            );
-        }
+  try {
+    return state.getNumberFormat(locale, filteredOptions).format(value);
+  } catch (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(`[React Intl] Error formatting number.\n${e}`);
     }
+  }
 
-    return String(value);
+  return String(value);
 }
 
 export function formatPlural(config, state, value, options = {}) {
-    const {locale} = config;
+  const {locale} = config;
 
-    let filteredOptions = filterProps(options, PLURAL_FORMAT_OPTIONS);
+  let filteredOptions = filterProps(options, PLURAL_FORMAT_OPTIONS);
 
-    try {
-        return state.getPluralFormat(locale, filteredOptions).format(value);
-    } catch (e) {
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(
-                `[React Intl] Error formatting plural.\n${e}`
-            );
-        }
+  try {
+    return state.getPluralFormat(locale, filteredOptions).format(value);
+  } catch (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(`[React Intl] Error formatting plural.\n${e}`);
     }
+  }
 
-    return 'other';
+  return 'other';
 }
 
-export function formatMessage(config, state, messageDescriptor = {}, values = {}) {
-    const {
-        locale,
-        formats,
-        messages,
-        defaultLocale,
-        defaultFormats,
-    } = config;
+export function formatMessage(
+  config,
+  state,
+  messageDescriptor = {},
+  values = {}
+) {
+  const {locale, formats, messages, defaultLocale, defaultFormats} = config;
 
-    const {
-        id,
-        defaultMessage,
-    } = messageDescriptor;
+  const {id, defaultMessage} = messageDescriptor;
 
-    // `id` is a required field of a Message Descriptor.
-    invariant(id, '[React Intl] An `id` must be provided to format a message.');
+  // `id` is a required field of a Message Descriptor.
+  invariant(id, '[React Intl] An `id` must be provided to format a message.');
 
-    const message   = messages && messages[id];
-    const hasValues = Object.keys(values).length > 0;
+  const message = messages && messages[id];
+  const hasValues = Object.keys(values).length > 0;
 
-    // Avoid expensive message formatting for simple messages without values. In
-    // development messages will always be formatted in case of missing values.
-    if (!hasValues && process.env.NODE_ENV === 'production') {
-        return message || defaultMessage || id;
-    }
+  // Avoid expensive message formatting for simple messages without values. In
+  // development messages will always be formatted in case of missing values.
+  if (!hasValues && process.env.NODE_ENV === 'production') {
+    return message || defaultMessage || id;
+  }
+
+  let formattedMessage;
+
+  if (message) {
+    try {
+      let formatter = state.getMessageFormat(message, locale, formats);
 
-    let formattedMessage;
-
-    if (message) {
-        try {
-            let formatter = state.getMessageFormat(
-                message, locale, formats
-            );
-
-            formattedMessage = formatter.format(values);
-        } catch (e) {
-            if (process.env.NODE_ENV !== 'production') {
-                console.error(
-                    `[React Intl] Error formatting message: "${id}" for locale: "${locale}"` +
-                    (defaultMessage ? ', using default message as fallback.' : '') +
-                    `\n${e}`
-                );
-            }
-        }
-    } else {
-        if (process.env.NODE_ENV !== 'production') {
-            // This prevents warnings from littering the console in development
-            // when no `messages` are passed into the <IntlProvider> for the
-            // default locale, and a default message is in the source.
-            if (!defaultMessage ||
-                (locale && locale.toLowerCase() !== defaultLocale.toLowerCase())) {
-
-                console.error(
-                    `[React Intl] Missing message: "${id}" for locale: "${locale}"` +
-                    (defaultMessage ? ', using default message as fallback.' : '')
-                );
-            }
-        }
+      formattedMessage = formatter.format(values);
+    } catch (e) {
+      if (process.env.NODE_ENV !== 'production') {
+        console.error(
+          `[React Intl] Error formatting message: "${id}" for locale: "${locale}"` +
+            (defaultMessage ? ', using default message as fallback.' : '') +
+            `\n${e}`
+        );
+      }
     }
+  } else {
+    if (process.env.NODE_ENV !== 'production') {
+      // This prevents warnings from littering the console in development
+      // when no `messages` are passed into the <IntlProvider> for the
+      // default locale, and a default message is in the source.
+      if (
+        !defaultMessage ||
+        (locale && locale.toLowerCase() !== defaultLocale.toLowerCase())
+      ) {
+        console.error(
+          `[React Intl] Missing message: "${id}" for locale: "${locale}"` +
+            (defaultMessage ? ', using default message as fallback.' : '')
+        );
+      }
+    }
+  }
 
-    if (!formattedMessage && defaultMessage) {
-        try {
-            let formatter = state.getMessageFormat(
-                defaultMessage, defaultLocale, defaultFormats
-            );
-
-            formattedMessage = formatter.format(values);
-        } catch (e) {
-            if (process.env.NODE_ENV !== 'production') {
-                console.error(
-                    `[React Intl] Error formatting the default message for: "${id}"` +
-                    `\n${e}`
-                );
-            }
-        }
+  if (!formattedMessage && defaultMessage) {
+    try {
+      let formatter = state.getMessageFormat(
+        defaultMessage,
+        defaultLocale,
+        defaultFormats
+      );
+
+      formattedMessage = formatter.format(values);
+    } catch (e) {
+      if (process.env.NODE_ENV !== 'production') {
+        console.error(
+          `[React Intl] Error formatting the default message for: "${id}"` +
+            `\n${e}`
+        );
+      }
     }
+  }
 
-    if (!formattedMessage) {
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(
-                `[React Intl] Cannot format message: "${id}", ` +
-                `using message ${message || defaultMessage ? 'source' : 'id'} as fallback.`
-            );
-        }
+  if (!formattedMessage) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(
+        `[React Intl] Cannot format message: "${id}", ` +
+          `using message ${message || defaultMessage
+            ? 'source'
+            : 'id'} as fallback.`
+      );
     }
+  }
 
-    return formattedMessage || message || defaultMessage || id;
+  return formattedMessage || message || defaultMessage || id;
 }
 
-export function formatHTMLMessage(config, state, messageDescriptor, rawValues = {}) {
-    // Process all the values before they are used when formatting the ICU
-    // Message string. Since the formatted message might be injected via
-    // `innerHTML`, all String-based values need to be HTML-escaped.
-    let escapedValues = Object.keys(rawValues).reduce((escaped, name) => {
-        let value = rawValues[name];
-        escaped[name] = typeof value === 'string' ? escape(value) : value;
-        return escaped;
-    }, {});
-
-    return formatMessage(config, state, messageDescriptor, escapedValues);
+export function formatHTMLMessage(
+  config,
+  state,
+  messageDescriptor,
+  rawValues = {}
+) {
+  // Process all the values before they are used when formatting the ICU
+  // Message string. Since the formatted message might be injected via
+  // `innerHTML`, all String-based values need to be HTML-escaped.
+  let escapedValues = Object.keys(rawValues).reduce((escaped, name) => {
+    let value = rawValues[name];
+    escaped[name] = typeof value === 'string' ? escape(value) : value;
+    return escaped;
+  }, {});
+
+  return formatMessage(config, state, messageDescriptor, escapedValues);
 }

package/src/inject.js

@@ -13,49 +13,47 @@ import {intlShape} from './types';
 import {invariantIntlContext} from './utils';
 
 function getDisplayName(Component) {
-    return Component.displayName || Component.name || 'Component';
+  return Component.displayName || Component.name || 'Component';
 }
 
 export default function injectIntl(WrappedComponent, options = {}) {
-    const {
-        intlPropName = 'intl',
-        withRef      = false,
-    } = options;
-
-    class InjectIntl extends Component {
-        static displayName = `InjectIntl(${getDisplayName(WrappedComponent)})`;
-
-        static contextTypes = {
-            intl: intlShape,
-        };
-
-        static WrappedComponent = WrappedComponent;
-
-        constructor(props, context) {
-            super(props, context);
-            invariantIntlContext(context);
-        }
-
-        getWrappedInstance() {
-            invariant(withRef,
-                '[React Intl] To access the wrapped instance, ' +
-                'the `{withRef: true}` option must be set when calling: ' +
-                '`injectIntl()`'
-            );
-
-            return this.refs.wrappedInstance;
-        }
-
-        render() {
-            return (
-                <WrappedComponent
-                    {...this.props}
-                    {...{[intlPropName]: this.context.intl}}
-                    ref={withRef ? 'wrappedInstance' : null}
-                />
-            );
-        }
+  const {intlPropName = 'intl', withRef = false} = options;
+
+  class InjectIntl extends Component {
+    static displayName = `InjectIntl(${getDisplayName(WrappedComponent)})`;
+
+    static contextTypes = {
+      intl: intlShape,
+    };
+
+    static WrappedComponent = WrappedComponent;
+
+    constructor(props, context) {
+      super(props, context);
+      invariantIntlContext(context);
+    }
+
+    getWrappedInstance() {
+      invariant(
+        withRef,
+        '[React Intl] To access the wrapped instance, ' +
+          'the `{withRef: true}` option must be set when calling: ' +
+          '`injectIntl()`'
+      );
+
+      return this.refs.wrappedInstance;
+    }
+
+    render() {
+      return (
+        <WrappedComponent
+          {...this.props}
+          {...{[intlPropName]: this.context.intl}}
+          ref={withRef ? 'wrappedInstance' : null}
+        />
+      );
     }
+  }
 
-    return InjectIntl;
+  return InjectIntl;
 }

package/src/locale-data-registry.js

@@ -8,35 +8,35 @@ import IntlMessageFormat from 'intl-messageformat';
 import IntlRelativeFormat from 'intl-relativeformat';
 
 export function addLocaleData(data = []) {
-    let locales = Array.isArray(data) ? data : [data];
-
-    locales.forEach((localeData) => {
-        if (localeData && localeData.locale) {
-            IntlMessageFormat.__addLocaleData(localeData);
-            IntlRelativeFormat.__addLocaleData(localeData);
-        }
-    });
+  let locales = Array.isArray(data) ? data : [data];
+
+  locales.forEach(localeData => {
+    if (localeData && localeData.locale) {
+      IntlMessageFormat.__addLocaleData(localeData);
+      IntlRelativeFormat.__addLocaleData(localeData);
+    }
+  });
 }
 
 export function hasLocaleData(locale) {
-    let localeParts = (locale || '').split('-');
+  let localeParts = (locale || '').split('-');
 
-    while (localeParts.length > 0) {
-        if (hasIMFAndIRFLocaleData(localeParts.join('-'))) {
-            return true;
-        }
-
-        localeParts.pop();
+  while (localeParts.length > 0) {
+    if (hasIMFAndIRFLocaleData(localeParts.join('-'))) {
+      return true;
     }
 
-    return false;
+    localeParts.pop();
+  }
+
+  return false;
 }
 
 function hasIMFAndIRFLocaleData(locale) {
-    let normalizedLocale = locale && locale.toLowerCase();
+  let normalizedLocale = locale && locale.toLowerCase();
 
-    return !!(
-        IntlMessageFormat.__localeData__[normalizedLocale] &&
-        IntlRelativeFormat.__localeData__[normalizedLocale]
-    );
+  return !!(
+    IntlMessageFormat.__localeData__[normalizedLocale] &&
+    IntlRelativeFormat.__localeData__[normalizedLocale]
+  );
 }