itube-specs 0.0.1026 → 0.0.1028

package/assets/scss/themes/dark/_theme.scss

@@ -450,8 +450,6 @@ $header-language-trigger: $color-zinc-400;
 $header-language-trigger--hover: $color-white;
 $header-language-trigger-bg: transparent;
 $header-language-trigger-bg--hover: transparent;
-$header-language-badge-bg: $color-zinc-800;
-$header-language-badge-text: $color-zinc-200;
 $header-language-menu-bg: $color-night;
 $header-language-menu-border: $color-zinc-800;
 $header-language-menu-shadow: 0 20px 25px -5px #{$mono-black-25}, 0 8px 10px -6px #{$mono-black-25};

package/assets/scss/themes/light/_theme.scss

@@ -506,8 +506,6 @@ $header-language-trigger: $color-white;
 $header-language-trigger--hover: $color-white;
 $header-language-trigger-bg: $color-slate-750;
 $header-language-trigger-bg--hover: $color-slate-700;
-$header-language-badge-bg: $color-slate-850;
-$header-language-badge-text: $color-white;
 $header-language-menu-bg: $color-slate-850;
 $header-language-menu-border: $color-white-10;
 $header-language-menu-shadow: 0 20px 25px -5px #{$mono-black-25}, 0 8px 10px -6px #{$mono-black-25};

package/components/filter/main.vue

@@ -9,7 +9,7 @@
     />
 
     <transition>
-      <LazyFilterPopup
+      <FilterPopup
         v-if="filterOpen"
         v-model="filterOpen"
         :title="$t('filter')"
@@ -37,7 +37,7 @@
             </UiBtn>
           </div>
         </template>
-      </LazyFilterPopup>
+      </FilterPopup>
     </transition>
   </div>
 </template>

package/components/info/model.vue

@@ -17,7 +17,7 @@
         v-if="akaNames.length"
         class="info-model__also"
       >
-        <span class="info-model__also-title">{{ t('also_known_as') }}</span>
+        <span class="info-model__also-title">{{ akaTitle }}</span>
         <template
           v-for="name in akaNames"
           :key="name"
@@ -206,6 +206,15 @@ const currentAvifSrc = computed(() => (isFallback.value ? placeholder.value.avif
 
 const akaNames = computed(() => props.card.akaNames.split(', ').filter(Boolean));
 
+const akaTitle = computed(() => {
+  const gender = (props.card.gender || '').toLowerCase();
+
+  if (gender === 'male' || /trans ?man/.test(gender)) return t('also_known_as_male');
+  if (gender === 'female' || /trans|shemale/.test(gender)) return t('also_known_as_female');
+
+  return t('also_known_as');
+});
+
 const socialItems = computed<ILinkItem[]>(() => (
   Object.entries(props.card.social || {}).map(([key, value]) => ({
     name: value || '',
@@ -342,8 +351,13 @@ const shareModelCard = computed<IModelCard>(() => ({
 }
 
 .info-model__also-name {
-  color: $info-model-also;
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
   white-space: nowrap;
+  vertical-align: top;
+  color: $info-model-also;
 }
 
 .info-model__also-name:not(:last-of-type)::after {

package/components/layout/header.vue

@@ -287,9 +287,6 @@ function closeLanguage() {
 
 .layout-header__language-badge {
   @include locale-badge;
-
-  background-color: $header-language-badge-bg;
-  color: $header-language-badge-text;
 }
 
 .layout-header__language-angle {

package/i18n/locales/de-DE.json

@@ -510,5 +510,7 @@
     "last_updated": "Zuletzt aktualisiert",
     "longest": "Längste",
     "longest_short": "Längste"
-  }
+  },
+  "also_known_as_male": "Auch bekannt als:",
+  "also_known_as_female": "Auch bekannt als:"
 }

package/i18n/locales/en-US.json

@@ -1,4 +1,6 @@
 {
+  "also_known_as_male": "Also known as:",
+  "also_known_as_female": "Also known as:",
   "model_about": "About",
   "top_models": "Top models",
   "playlists_empty": {

package/i18n/locales/es-ES.json

@@ -510,5 +510,7 @@
     "last_updated": "Última actualización",
     "longest": "Más largo",
     "longest_short": "Largos"
-  }
+  },
+  "also_known_as_male": "También conocido como:",
+  "also_known_as_female": "También conocida como:"
 }

package/i18n/locales/fr-FR.json

@@ -510,5 +510,7 @@
     "last_updated": "Dernière mise à jour",
     "longest": "Les plus longues",
     "longest_short": "Longues"
-  }
+  },
+  "also_known_as_male": "Également connu sous le nom de :",
+  "also_known_as_female": "Également connue sous le nom de :"
 }

package/i18n/locales/it-IT.json

@@ -510,5 +510,7 @@
     "last_updated": "Ultimo aggiornamento",
     "longest": "Più lungo",
     "longest_short": "Lunghi"
-  }
+  },
+  "also_known_as_male": "Conosciuto anche come:",
+  "also_known_as_female": "Conosciuta anche come:"
 }

package/i18n/locales/ja-JP.json

@@ -510,5 +510,7 @@
     "last_updated": "最終更新",
     "longest": "最長",
     "longest_short": "最長"
-  }
+  },
+  "also_known_as_male": "別名：",
+  "also_known_as_female": "別名："
 }

package/i18n/locales/ko-KR.json

@@ -510,5 +510,7 @@
     "last_updated": "마지막 업데이트",
     "longest": "가장 긴",
     "longest_short": "가장 긴"
-  }
+  },
+  "also_known_as_male": "다른 이름:",
+  "also_known_as_female": "다른 이름:"
 }

package/i18n/locales/ru-RU.json

@@ -510,5 +510,7 @@
     "last_updated": "Последние",
     "longest": "Самые длинные",
     "longest_short": "Длинные"
-  }
+  },
+  "also_known_as_male": "Также известен как:",
+  "also_known_as_female": "Также известна как:"
 }

package/i18n/locales/zh-CN.json

@@ -510,5 +510,7 @@
     "last_updated": "最后更新",
     "longest": "最长",
     "longest_short": "最长"
-  }
+  },
+  "also_known_as_male": "又名：",
+  "also_known_as_female": "又名："
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.1026",
+  "version": "0.0.1028",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {

package/server/middleware/locale-redirect.ts

@@ -18,6 +18,7 @@ export default defineEventHandler((event) => {
     subdomains,
     codes,
     defaultCode,
+    protocol: getRequestProtocol(event, { xForwardedProto: true }),
   });
 
   if (vary) setResponseHeader(event, 'Vary', 'Accept-Language, Cookie');

package/server/utils/__tests__/locale-redirect.test.ts

@@ -25,12 +25,18 @@ describe('resolveLocaleRedirect', () => {
     subdomains: { ru: 'ru', ja: 'jp', de: 'de' },
     codes: CODES,
     defaultCode: 'en',
+    protocol: 'https',
   };
 
   it('уводит с базового домена на поддомен языка браузера', () => {
     expect(resolveLocaleRedirect(base)).toEqual({ vary: true, location: 'https://jp.a.com/videos?page=2' });
   });
 
+  it('протокол — как у запроса: локально без прокси остаётся http', () => {
+    expect(resolveLocaleRedirect({ ...base, headers: { ...base.headers, host: 'localhost:3200' }, protocol: 'http' }).location)
+      .toBe('http://jp.localhost:3200/videos?page=2');
+  });
+
   it('язык браузера — дефолтный: без редиректа, но с Vary', () => {
     expect(resolveLocaleRedirect({ ...base, headers: { ...base.headers, 'accept-language': 'en-US' } })).toEqual({ vary: true });
   });

package/server/utils/locale-redirect.ts

@@ -52,6 +52,8 @@ export interface ILocaleRedirectInput {
   subdomains: LocaleSubdomains
   codes: readonly string[]
   defaultCode: string
+  /** Протокол запроса (`getRequestProtocol` с учётом x-forwarded-proto): без прокси локально — http. */
+  protocol: string
 }
 
 export interface ILocaleRedirectDecision {
@@ -69,7 +71,7 @@ export interface ILocaleRedirectDecision {
  * переключателем, а cookie могла не доехать: на localhost она живёт только на своём поддомене.
  */
 export function resolveLocaleRedirect(input: ILocaleRedirectInput): ILocaleRedirectDecision {
-  const { method, path, headers, langCookie, subdomains, codes, defaultCode } = input;
+  const { method, path, headers, langCookie, subdomains, codes, defaultCode, protocol } = input;
   const skip = { vary: false };
 
   if (method !== 'GET') return skip;
@@ -97,7 +99,6 @@ export function resolveLocaleRedirect(input: ILocaleRedirectInput): ILocaleRedir
   const target = localeDomain(detected, baseDomainFromHost(host, subdomains), subdomains);
   if (target === host) return { vary: true };
 
-  const protocol = headers['x-forwarded-proto'] || 'https';
 
   return { vary: true, location: `${protocol}://${target}${path}` };
 }