@cranium/i18n - npm Package Compare versions

Comparing version 2.2.1 to 3.0.0

dist/i18n.d.ts

@@ -13,2 +13,10 @@ import { Component } from 'react';
 export declare function isRtlLanguage(lang: string): boolean;
+export type Language = {
+    id: string;
+    locale?: string;
+    pluralCategoryNames?: string[];
+    pluralExamples?: string[];
+    pluralRules?: string;
+    [key: string]: any;
+};
 export type StorageType = {
@@ -32,2 +40,4 @@ setItem: (key: string, value: any) => void;
     };
+    localeLanguage?: string;
+    getLanguages: () => Promise<(Language | string)[]> | string[] | Language[];
 };
@@ -39,5 +49,9 @@ type State = {
 export declare class TranslateProvider extends Component<PropTypes, State> {
+    langs: (Language | string)[];
+    lang: Language | string;
     constructor(props: any);
     refreshTranslations(lang: string): void;
     initTranslations(lang: string): void;
+    saveLang(lang: string): void;
+    getLanguage(lang: string, defaultLang: string, langs?: (Language | string)[] | null): string;
     initTranslationsLang(): void;
@@ -60,6 +74,14 @@ setLanguage(lang: string): void;
 export declare function useGetLanguage(): string;
-export declare function useGettext(): (text: string, params?: any) => string;
-export declare function usePGettext(): (id: string, text: string, params?: any) => string;
-export declare function useNGettext(): (singular: string, plural: string, count: number, params?: any) => string;
-export declare function useNPGettext(): (id: string, singular: string, plural: string, count: number, params?: any) => string;
+export declare function useGettext(): {
+    gettext: (text: string, params?: any) => string;
+};
+export declare function usePGettext(): {
+    pgettext: (id: string, text: string, params?: any) => string;
+};
+export declare function useNGettext(): {
+    ngettext: (singular: string, plural: string, count: number, params?: any) => string;
+};
+export declare function useNPGettext(): {
+    npgettext: (id: string, singular: string, plural: string, count: number, params?: any) => string;
+};
 export declare function useSetLanguage(): (lang: string) => void;
@@ -66,0 +88,0 @@ export declare const Translator: import("react").Consumer<ContextType>;

dist/i18n.js

@@ -30,2 +30,8 @@ "use strict";
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -41,2 +47,3 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 var TarnslationsContext = (0, _react.createContext)({});
@@ -65,2 +72,5 @@ exports.TarnslationsContext = TarnslationsContext;
     _this = _super.call(this, props);
+    _defineProperty(_assertThisInitialized(_this), "langs", void 0);
+    _defineProperty(_assertThisInitialized(_this), "lang", void 0);
+    _this.langs = [];
     _this.state = {
@@ -112,2 +122,22 @@ translations: props.defaultTranslations || {},
   }, {
+    key: "saveLang",
+    value: function saveLang(lang) {
+      this.lang = this.langs.find(function (item) {
+        return typeof item === 'string' ? item === lang : item.id = lang;
+      });
+    }
+  }, {
+    key: "getLanguage",
+    value: function getLanguage(lang, defaultLang, langs) {
+      if (!Array.isArray(langs)) {
+        return lang;
+      }
+      if (langs.find(function (item) {
+        return typeof item === 'string' ? item === lang : item.id = lang;
+      })) {
+        return lang;
+      }
+      return defaultLang;
+    }
+  }, {
     key: "initTranslationsLang",
@@ -121,15 +151,23 @@ value: function initTranslationsLang() {
         defaultLanguage = _this$props3.defaultLanguage;
-      Promise.resolve(storage.getItem(langKey)).then(function (language) {
+      Promise.all([Promise.resolve(storage.getItem(langKey)), this.props.getLanguages ? Promise.resolve(this.props.getLanguages()) : null]).then(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          language = _ref2[0],
+          langs = _ref2[1];
+        _this4.langs = langs;
         if (!language) {
-          throw new Error('Language not defined');
+          return Promise.reject(langs);
         }
+        var _lang = _this4.getLanguage(language, _this4.props.defaultLanguage, langs);
+        _this4.saveLang(_lang);
         _this4.setState({
-          language: language
+          language: _lang
         });
-        _this4.refreshTranslations(language);
-        _this4.initTranslations(language);
-      }).catch(function (_) {
-        storage.setItem(langKey, defaultLanguage.split('-')[0]);
-        _this4.refreshTranslations(defaultLanguage.split('-')[0]);
-        _this4.initTranslations(defaultLanguage.split('-')[0]);
+        _this4.refreshTranslations(_lang);
+        _this4.initTranslations(_lang);
+      }).catch(function (langs) {
+        var _lang = _this4.getLanguage(_this4.props.localeLanguage, _this4.props.defaultLanguage, langs);
+        _this4.saveLang(_lang);
+        storage.setItem(langKey, _lang.split('-')[0]);
+        _this4.refreshTranslations(_lang.split('-')[0]);
+        _this4.initTranslations(_lang.split('-')[0]);
       });
@@ -148,2 +186,3 @@ }
       }
+      this.saveLang(lang);
       var language = this.state.language;
@@ -245,12 +284,20 @@ var _this$props4 = this.props,
 function useGettext() {
-  return (0, _react.useContext)(TarnslationsContext).gettext;
+  return {
+    gettext: (0, _react.useContext)(TarnslationsContext).gettext
+  };
 }
 function usePGettext() {
-  return (0, _react.useContext)(TarnslationsContext).pgettext;
+  return {
+    pgettext: (0, _react.useContext)(TarnslationsContext).pgettext
+  };
 }
 function useNGettext() {
-  return (0, _react.useContext)(TarnslationsContext).ngettext;
+  return {
+    ngettext: (0, _react.useContext)(TarnslationsContext).ngettext
+  };
 }
 function useNPGettext() {
-  return (0, _react.useContext)(TarnslationsContext).npgettext;
+  return {
+    npgettext: (0, _react.useContext)(TarnslationsContext).npgettext
+  };
 }
@@ -266,4 +313,4 @@ function useSetLanguage() {
   return (0, _jsxRuntime.jsx)(TarnslationsContext.Consumer, {
-    children: function children(_ref) {
-      var gettext = _ref.gettext;
+    children: function children(_ref3) {
+      var gettext = _ref3.gettext;
       return gettext(text, params);
@@ -278,4 +325,4 @@ }
   return (0, _jsxRuntime.jsx)(TarnslationsContext.Consumer, {
-    children: function children(_ref2) {
-      var pgettext = _ref2.pgettext;
+    children: function children(_ref4) {
+      var pgettext = _ref4.pgettext;
       return pgettext(id, text, params);
@@ -291,4 +338,4 @@ }
   return (0, _jsxRuntime.jsx)(TarnslationsContext.Consumer, {
-    children: function children(_ref3) {
-      var ngettext = _ref3.ngettext;
+    children: function children(_ref5) {
+      var ngettext = _ref5.ngettext;
       return ngettext(singular, plural, count, params);
@@ -305,4 +352,4 @@ }
   return (0, _jsxRuntime.jsx)(TarnslationsContext.Consumer, {
-    children: function children(_ref4) {
-      var npgettext = _ref4.npgettext;
+    children: function children(_ref6) {
+      var npgettext = _ref6.npgettext;
       return npgettext(singular, plural, id, count, params);
@@ -309,0 +356,0 @@ }

package.json

 {
   "name": "@cranium/i18n",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "React lightweight simple translation module",
@@ -5,0 +5,0 @@ "author": "Sasha <[e-mail]>",

No alert changes

Improved metrics

Total package byte prevSize

47385

increased by15.14%

Lines of code

458

increased by18.35%

No dependency changes