Merge pull request #1742 from 1hitsong/ellipsisTextUnify

Update ellipsis text to use translation. Remove leading space
jellyfin · Mar 12, 2024 · 98d6c55 · 98d6c55
2 parents 6573aa4 + e939cd9
commit 98d6c55
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/components/music/AlbumView.bs b/components/music/AlbumView.bs
@@ -14,6 +14,7 @@ sub init()
     m.songList.observeField("doneLoading", "onDoneLoading")
 
     m.dscr = m.top.findNode("overview")
+    m.dscr.ellipsisText = tr("... (Press * to read more)")
     createDialogPallete()
 end sub
 

diff --git a/components/music/AlbumView.xml b/components/music/AlbumView.xml
@@ -13,7 +13,7 @@
           <JFButton id="instantMix" minChars="8" text="Instant Mix"></JFButton>
         </LayoutGroup>
         <LayoutGroup id="infoGroup" layoutDirection="vert" itemSpacings="[15]">
-          <Label id="overview" wrap="true" height="310" width="1250" ellipsisText=" ...  (Press * to read more)" />
+          <Label id="overview" wrap="true" height="310" width="1250" />
           <Rectangle id='songListRect' translation="[-30, 0]" width="1260" height="510" color="0x202020ff">
             <AlbumTrackList itemComponentName="SongItem" id="songList" translation="[45, 25]" itemSize="[1170,60]" numRows="7" />
           </Rectangle>

diff --git a/components/music/ArtistView.bs b/components/music/ArtistView.bs
@@ -39,6 +39,7 @@ sub init()
     m.backDrop = m.top.findNode("backdrop")
     m.artistImage = m.top.findNode("artistImage")
     m.dscr = m.top.findNode("overview")
+    m.dscr.ellipsisText = tr("... (Press * to read more)")
     m.dscr.observeField("isTextEllipsized", "onEllipsisChanged")
     createDialogPallete()
 end sub

diff --git a/components/music/ArtistView.xml b/components/music/ArtistView.xml
@@ -8,7 +8,7 @@
         <LayoutGroup id="toplevel" layoutDirection="vert" itemSpacings="[75]">
           <LayoutGroup id="main_group" layoutDirection="horiz" itemSpacings="[125]">
             <LayoutGroup layoutDirection="vert" itemSpacings="[75]">
-              <Label id="overview" wrap="true" lineSpacing="25" maxLines="6" width="1080" ellipsisText=" ...  (Press * to read more)" />
+              <Label id="overview" wrap="true" lineSpacing="25" maxLines="6" width="1080" />
               <ButtonGroupHoriz id="buttons" itemSpacings="[20]">
                 <IconButton id="play" background="#070707" focusBackground="#00a4dc" padding="35" icon="pkg:/images/icons/play.png" text="Play" height="85" width="150" />
                 <IconButton id="instantMix" background="#070707" focusBackground="#00a4dc" padding="35" icon="pkg:/images/icons/instantMix.png" text="Instant Mix" height="85" width="150" />

diff --git a/components/music/PlaylistView.bs b/components/music/PlaylistView.bs
@@ -13,6 +13,7 @@ sub init()
     m.songList.observeField("doneLoading", "onDoneLoading")
 
     m.dscr = m.top.findNode("overview")
+    m.dscr.ellipsisText = tr("... (Press * to read more)")
     createDialogPallete()
 end sub
 

diff --git a/components/music/PlaylistView.xml b/components/music/PlaylistView.xml
@@ -12,7 +12,7 @@
           <JFButton id="playAll" minChars="8" text="Play All"></JFButton>
         </LayoutGroup>
         <LayoutGroup id="infoGroup" layoutDirection="vert" itemSpacings="[15]">
-          <Label id="overview" wrap="true" height="310" width="1250" ellipsisText=" ...  (Press * to read more)" />
+          <Label id="overview" wrap="true" height="310" width="1250" />
           <Rectangle id='songListRect' translation="[-30, 0]" width="1260" height="510" color="0x202020ff">
             <AlbumTrackList itemComponentName="SongItem" id="songList" translation="[45, 25]" itemSize="[1170,60]" numRows="7" />
           </Rectangle>

diff --git a/components/tvshows/TVShowDetails.bs b/components/tvshows/TVShowDetails.bs
@@ -14,7 +14,7 @@ sub init()
     m.seasons = m.top.findNode("seasons")
     m.overview = m.top.findNode("overview")
 
-    m.overview.ellipsisText = tr(" ... (Press * to read more)")
+    m.overview.ellipsisText = tr("... (Press * to read more)")
 end sub
 
 sub itemContentChanged()

diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
@@ -1252,8 +1252,8 @@
             <extracomment>General use word when we want to randomize data</extracomment>
         </message>
         <message>
-            <source> ... (Press * to read more)</source>
-            <translation> ... (Press * to read more)</translation>
+            <source>... (Press * to read more)</source>
+            <translation>... (Press * to read more)</translation>
             <extracomment>Ellipsis Text for when text overflows its container</extracomment>
         </message>
     </context>