diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index 61effc4ee..4b37577af 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -141,7 +141,6 @@ const PageBorderColor = props => { const PageChartType = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const types = storeChartSettings.types; const storeFocusObjects = props.storeFocusObjects; @@ -150,7 +149,7 @@ const PageChartType = props => { return ( - +
@@ -179,14 +178,13 @@ const PageChartType = props => { const PageChartStyle = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; const chartStyles = storeChartSettings.chartStyles; return ( - + {chartStyles ?
@@ -203,7 +201,7 @@ const PageChartStyle = props => { ) }) ) - }) :
{_t.textNoStyles}
+ }) :
{t('Edit.textNoStyles')}
}
@@ -215,11 +213,10 @@ const PageChartStyle = props => { const PageChartDesignFill = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); return ( - +
@@ -229,7 +226,6 @@ const PageChartDesignFill = props => { const PageChartBorder = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const shapeObject = props.storeFocusObjects.shapeObject; @@ -253,12 +249,12 @@ const PageChartBorder = props => { return ( - +
-
{_t.textSize}
+
{t('Edit.textSize')}
{setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} @@ -269,7 +265,7 @@ const PageChartBorder = props => { {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
- { const PageDesign = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; // console.log(chartStyles, curType); @@ -298,7 +293,7 @@ const PageDesign = props => { return ( - + {Device.phone && @@ -309,10 +304,10 @@ const PageDesign = props => { - - - - + + + @@ -476,31 +471,30 @@ const PageReorder = props => { const EditChart = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); return ( - - - - {props.onRemoveChart()}} className='button-red button-fill button-raised'/> + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> ) diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index f57ffe08f..4a5cded23 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -151,7 +151,6 @@ const PageBorderColor = props => { const PageChartType = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const types = storeChartSettings.types; const storeFocusObjects = props.storeFocusObjects; @@ -160,7 +159,7 @@ const PageChartType = props => { return ( - +
@@ -189,14 +188,13 @@ const PageChartType = props => { const PageChartStyle = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; const chartStyles = storeChartSettings.chartStyles; return ( - + {chartStyles ?
@@ -213,7 +211,7 @@ const PageChartStyle = props => { ) }) ) - }) :
{_t.textNoStyles}
+ }) :
{t('View.Edit.textNoStyles')}
}
@@ -225,11 +223,10 @@ const PageChartStyle = props => { const PageChartDesignFill = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); return ( - +
@@ -239,7 +236,6 @@ const PageChartDesignFill = props => { const PageChartBorder = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const shapeObject = props.storeFocusObjects.shapeObject; @@ -263,12 +259,12 @@ const PageChartBorder = props => { return ( - +
-
{_t.textSize}
+
{t('View.Edit.textSize')}
{setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} @@ -279,7 +275,7 @@ const PageChartBorder = props => { {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
- { const PageDesign = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; if (!chartProperties && Device.phone) { @@ -305,7 +300,7 @@ const PageDesign = props => { return ( - + {Device.phone && @@ -316,10 +311,10 @@ const PageDesign = props => { - - - - + + + @@ -423,27 +418,26 @@ const PageAlign = props => { const EditChart = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); return ( - - - - {props.onRemoveChart()}} className='button-red button-fill button-raised'/> + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> ) diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index f795d5cef..74b619f9a 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -146,7 +146,6 @@ const PageBorderColor = props => { const PageChartType = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const types = storeChartSettings.types; const storeFocusObjects = props.storeFocusObjects; @@ -155,7 +154,7 @@ const PageChartType = props => { return ( - +
@@ -182,14 +181,13 @@ const PageChartType = props => { const PageChartStyle = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; const chartStyles = storeChartSettings.chartStyles; return ( - + {chartStyles ?
@@ -206,7 +204,7 @@ const PageChartStyle = props => { ) }) ) - }) :
{_t.textNoStyles}
+ }) :
{t('View.Edit.textNoStyles')}
}
@@ -218,11 +216,10 @@ const PageChartStyle = props => { const PageChartDesignFill = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); return ( - +
@@ -232,7 +229,6 @@ const PageChartDesignFill = props => { const PageChartBorder = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const storeFocusObjects = props.storeFocusObjects; const shapeProperties = storeFocusObjects.shapeObject && storeFocusObjects.shapeObject.get_ShapeProperties(); @@ -261,12 +257,12 @@ const PageChartBorder = props => { return ( - +
-
{_t.textSize}
+
{t('View.Edit.textSize')}
{setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} @@ -277,7 +273,7 @@ const PageChartBorder = props => { {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
- { const PageDesign = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeFocusObjects = props.storeFocusObjects; const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); @@ -307,7 +302,7 @@ const PageDesign = props => { return ( - + {Device.phone && @@ -316,10 +311,10 @@ const PageDesign = props => { - - - - + + + @@ -1428,7 +1423,6 @@ const PageHorLabelPosition = props => { const EditChart = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeFocusObjects = props.storeFocusObjects; const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); const chartType = chartProperties && chartProperties.getType(); @@ -1461,19 +1455,19 @@ const EditChart = props => { return ( - - - { onVerAxisTickMinor: props.onVerAxisTickMinor, onVerAxisLabelPos: props.onVerAxisLabelPos }}> - { disableAxisPos, needReverse }}> - - {props.onRemoveChart()}} className='button-red button-fill button-raised'/> + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> )