Skip to content

Commit 1be9e85

Browse files
authored
Merge branch 'cyntler:main' into rerendering
2 parents a1d29d7 + b9d9d28 commit 1be9e85

File tree

7 files changed

+7829
-27747
lines changed

7 files changed

+7829
-27747
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ File viewer for React.
2929
| txt | text/plain |
3030
| xls | application/vnd.ms-excel |
3131
| xlsx | application/vnd.openxmlformats-officedocument.spreadsheetml.sheet |
32+
| mp4 | video/mp4 |
3233

3334
## Storybook Demo
3435

package-lock.json

Lines changed: 7806 additions & 27744 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cyntler/react-doc-viewer",
3-
"version": "1.14.0",
3+
"version": "1.14.1",
44
"description": "File viewer for React.",
55
"author": "Matthew Mogford / Damian Cyntler",
66
"keywords": [

src/DocViewer.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ const DocViewer = forwardRef<DocViewerRef, DocViewerProps>((props, ref) => {
4545
<ThemeProvider
4646
theme={theme ? { ...defaultTheme, ...theme } : defaultTheme}
4747
>
48-
<Container id="react-doc-viewer" data-testid="react-doc-viewer">
48+
<Container
49+
id="react-doc-viewer"
50+
data-testid="react-doc-viewer"
51+
className={props.className}
52+
style={props.style}
53+
>
4954
<HeaderBar />
5055
<ProxyRenderer />
5156
</Container>

src/i18n.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import ar from "./locales/ar.json";
99
import sr from "./locales/sr.json";
1010
import sr_cyr from "./locales/sr_cyr.json";
1111
import ja from "./locales/ja.json";
12+
import ru from "./locales/ru.json";
13+
import se from "./locales/se.json";
1214

1315
export const locales = {
1416
en,
@@ -22,6 +24,8 @@ export const locales = {
2224
sr,
2325
sr_cyr,
2426
ja,
27+
ru,
28+
se
2529
};
2630

2731
export type AvailableLanguages = keyof typeof locales;

src/locales/ru.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"documentNavInfo": "Документ {{ currentFileNo }} of {{ allFilesCount }}",
2+
"documentNavInfo": "Документ {{ currentFileNo }} из {{ allFilesCount }}",
33
"noRendererMessage": "Данный тип файла не поддерживается рендером: {{{ fileType }}}",
44
"downloadButtonLabel": "Скачать файл",
55
"brokenFile": "Ваш файл сломан. Пожалуйста, проверьте его на своём комьютере.",

src/locales/se.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"documentNavInfo": "Dokument {{ currentFileNo }} av {{ allFilesCount }}",
3+
"noRendererMessage": "Ingen renderare för filtypen: {{{ fileType }}}",
4+
"downloadButtonLabel": "Ladda ner",
5+
"brokenFile": "Filen är trasig. Var vänlig kontrollera den på din maskin.",
6+
"msgPluginRecipients": "Mottagare",
7+
"msgPluginSender": "Avsändare",
8+
"pdfPluginLoading": "Laddar...",
9+
"pdfPluginPageNumber": "Sida {{ currentPage }}/{{ allPagesCount }}"
10+
}

0 commit comments

Comments
 (0)