Merge branch 'master' of ssh://git.bitmaster.ru:34022/npm/common

gettext/index.ts

@@ -91,6 +91,7 @@ export function withGettext(...webpackContexts) {
     }
     }
     // @ts-ignore
     // @ts-ignore
     WithTranslations.displayName = 'WithTranslations(' + Component.name + ')';
     WithTranslations.displayName = 'WithTranslations(' + Component.name + ')';
+    require('hoist-non-react-statics')(WithTranslations, Component);
     return WithTranslations;
     return WithTranslations;
   };
   };
 }
 }
@@ -122,7 +123,7 @@ export function requireTranslations(webpackContext /*: WebpackContext*/): Transl
 function assignData(dst: Translations, ...srcs: GettextData[]): Translations {
 function assignData(dst: Translations, ...srcs: GettextData[]): Translations {
   srcs.forEach(data => {
   srcs.forEach(data => {
     // @ts-ignore
     // @ts-ignore
-    if ('locale_data' in data) data = data['locale_data'];
+    if ('locale_data' in data) data = data['locale_data']['messages'];
     const locale_ = data[''].language || data[''].lang || data[''].locale; if (!locale_ || typeof(locale_) !== 'string') return;
     const locale_ = data[''].language || data[''].lang || data[''].locale; if (!locale_ || typeof(locale_) !== 'string') return;
     const locale = locale_.replace(/_/g, '-');
     const locale = locale_.replace(/_/g, '-');
     const podata = data['%podata'];
     const podata = data['%podata'];

jsonapi/resources.ts

@@ -30,10 +30,12 @@ export type JsonApi<A> =
   | RelatedMany<A>
   | RelatedMany<A>
   | WithName<A>
   | WithName<A>
   | WithDefault<A>
   | WithDefault<A>
+  ;
 
 
 
 
 // Базовый класс для наследования методов
 // Базовый класс для наследования методов
 export class JsonApiBase<A> {
 export class JsonApiBase<A> {
+  // @ts-ignore
   readonly _A: A;
   readonly _A: A;
 
 
   /**
   /**