fix(studio): one import of each locale file, and a photo's cut edge in the split out photo view

client/src/components/Studio/PhotoView.tsx

@@ -5,7 +5,8 @@ import { fontStack } from './bookFonts';
 import { photoSrc } from './bookRender';
 import { usePaintId } from './paint/usePaintId';
 import { pictureFilter, silhouetteShadows, svgFilterMatrices, zoomPlacement } from './photo/photoLook';
-import { HOLED_SHAPES, SHAPE_PATHS, scalePath, unitPath } from './shapes';
+import { HOLED_SHAPES, SHAPE_PATHS, scalePath } from './shapes';
+import { photoClip } from './shapeOutline';
 
 /**
  * A picture on the page: possibly cut to a shape, possibly sitting in
@@ -271,7 +272,9 @@ export function PhotoView({
   const filterRef = usePaintId(`f-${el.id}`);
   // The shape the picture is cut to; a rect mask is no mask at all.
   const mask = el.mask && el.mask !== 'rect' ? el.mask : null;
-  const clipped = mask !== null;
+  // The cut as a unit path: the mask, its cut edge, or a cut edge on the rectangle (shapeOutline.ts).
+  const clip = photoClip(el, el.frame.w - pad * 2, el.frame.h - pad - (bottom || pad));
+  const clipped = clip !== null;
   // An empty frame wears the frame style but none of the look: a border or a
   // shadow around a hatch would read as part of the picture to come.
   const empty = el.photoId == null;
@@ -356,12 +359,12 @@ export function PhotoView({
         <ShapeSilhouette frame={el.frame} mask={mask} look={look} />
       )}
 
-      {(mask || filterId) && (
+      {(clip || filterId) && (
         <svg width="0" height="0" style={{ position: 'absolute' }} aria-hidden>
           <defs>
-            {mask && (
+            {clip && (
               <clipPath id={clipId} clipPathUnits="objectBoundingBox">
-                <path d={unitPath(SHAPE_PATHS[mask])} />
+                <path d={clip} />
               </clipPath>
             )}
             {filterId && (

shared/src/i18n/ar/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/az/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/br/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/ca/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/cs/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/de/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/en/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/es/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/et/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/fr/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/gr/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/hu/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/id/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/it/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/ja/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/ko/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/nl/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/pl/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/ru/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/sk/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/sv/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/th/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/tr/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/uk/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/vi/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/zh-TW/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';

shared/src/i18n/zh/index.ts

@@ -66,7 +66,6 @@ import studioPhoto from './studioPhoto';
 import studioStickers from './studioStickers';
 import studioShapes from './studioShapes';
 import studioThemes from './studioThemes';
-import studioStickers from './studioStickers';
 import studioText from './studioText';
 import system_notice from './system_notice';
 import todo from './todo';