Skip to content

Commit

Permalink
corrected texts
Browse files Browse the repository at this point in the history
  • Loading branch information
GrabowskiM committed Oct 31, 2023
1 parent 80b96cc commit 9b9b9d4
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
const saveDate = ibexa.helpers.timezone.convertDateToTimezone(new Date(), userPreferredTimezone);
const saveTime = moment(saveDate).formatICU('HH:mm');
const saveMessage = Translator.trans(
/*@Desc("Autosave is on, draft created %time%")*/ 'content_edit.autosave.status_saved.message.full',
/*@Desc("Autosave is on, draft saved %time%")*/ 'content_edit.autosave.status_saved.message.full',
{ time: saveTime },
'ibexa_content',
);
Expand Down
8 changes: 0 additions & 8 deletions src/bundle/Resources/public/scss/_autosave.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@
}
}

&--saved {
color: $ibexa-color-success;

.ibexa-autosave__icon-saved {
fill: $ibexa-color-success;
}
}

&--error {
color: $ibexa-color-danger;

Expand Down
1 change: 1 addition & 0 deletions src/bundle/Resources/public/scss/_context-menu.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.ibexa-context-menu-wrapper {
display: flex;
width: 100%;
}

.ibexa-context-menu {
Expand Down
7 changes: 3 additions & 4 deletions src/bundle/Resources/public/scss/_edit-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
display: flex;
flex-direction: column;
justify-content: center;
white-space: nowrap;
padding-left: 0;
margin-top: calculateRem(20px);
height: calculateRem(48px);
Expand All @@ -83,10 +84,8 @@

&__context-actions {
display: flex;
position: absolute;
top: calculateRem(36px);
right: calculateRem(64px);
width: 55%;
margin-top: calculateRem(20px);
width: 100%;
}

&__tooltip {
Expand Down
29 changes: 27 additions & 2 deletions src/bundle/Resources/translations/ibexa_content.en.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
</header>
<body>
<trans-unit id="0c103b4bcaaca67202176e8f5be544eb4c307e8e" resname="content.autosave.turn_off.message">
<source>You can turn autosave off in your user settings</source>
<target state="new">You can turn autosave off in your user settings</target>
<note>key: content.autosave.turn_off.message</note>
</trans-unit>
<trans-unit id="8343cec7024fb459d738278aca82b39710b89c50" resname="content.create_draft.success">
<source>Created a new draft for '%name%'.</source>
<target state="new">Created a new draft for '%name%'.</target>
Expand Down Expand Up @@ -51,11 +56,31 @@
<target state="new">Content item '%name%' revealed.</target>
<note>key: content.reveal.success</note>
</trans-unit>
<trans-unit id="6048a32d88dbcdd5a62e232ed092a8efd11ed375" resname="content_edit.autosave.status_error.message">
<source>Saving error</source>
<target state="new">Saving error</target>
<note>key: content_edit.autosave.status_error.message</note>
</trans-unit>
<trans-unit id="d364f97b275523fe571da0da612fdbc4a1064550" resname="content_edit.autosave.status_off.message">
<source>Autosave is off, draft not created</source>
<target state="new">Autosave is off, draft not created</target>
<note>key: content_edit.autosave.status_off.message</note>
</trans-unit>
<trans-unit id="93f0a5980aa14af989f4106ffda244ba02db1c32" resname="content_edit.autosave.status_on.message">
<source>Autosave is on, draft created</source>
<target state="new">Autosave is on, draft created</target>
<note>key: content_edit.autosave.status_on.message</note>
</trans-unit>
<trans-unit id="123a6cff0d98d08927f6666246d451da50941a7b" resname="content_edit.autosave.status_saved.message.full">
<source>Autosave is on, draft created %time%</source>
<target state="new">Autosave is on, draft created %time%</target>
<source>Autosave is on, draft saved %time%</source>
<target state="new">Autosave is on, draft saved %time%</target>
<note>key: content_edit.autosave.status_saved.message.full</note>
</trans-unit>
<trans-unit id="da43c85269df161b340e92296642e18ec6af033e" resname="content_edit.autosave.status_saving.message">
<source>Saving</source>
<target state="new">Saving</target>
<note>key: content_edit.autosave.status_saving.message</note>
</trans-unit>
<trans-unit id="750bead6705b295c7b7d66c27b2768c1b9329ed5" resname="editing_details">
<source>Location: %location%</source>
<target state="new">Location: %location%</target>
Expand Down
25 changes: 0 additions & 25 deletions src/bundle/Resources/translations/messages.en.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@
<target state="new">words</target>
<note>key: character_counter.words</note>
</trans-unit>
<trans-unit id="0c103b4bcaaca67202176e8f5be544eb4c307e8e" resname="content.autosave.turn_off.message">
<source>You can turn autosave off in your user settings</source>
<target state="new">You can turn autosave off in your user settings</target>
<note>key: content.autosave.turn_off.message</note>
</trans-unit>
<trans-unit id="21e7545fc420d95a59a713437d9dc28d85d82ceb" resname="content.details.content_id">
<source>Content ID: %contentId%</source>
<target state="new">Content ID: %contentId%</target>
Expand Down Expand Up @@ -181,26 +176,6 @@
<target state="new">In Trash</target>
<note>key: content.in_trash</note>
</trans-unit>
<trans-unit id="6048a32d88dbcdd5a62e232ed092a8efd11ed375" resname="content_edit.autosave.status_error.message">
<source>Saving error</source>
<target state="new">Saving error</target>
<note>key: content_edit.autosave.status_error.message</note>
</trans-unit>
<trans-unit id="d364f97b275523fe571da0da612fdbc4a1064550" resname="content_edit.autosave.status_off.message">
<source>Autosave is off, draft not created</source>
<target state="new">Autosave is off, draft not created</target>
<note>key: content_edit.autosave.status_off.message</note>
</trans-unit>
<trans-unit id="93f0a5980aa14af989f4106ffda244ba02db1c32" resname="content_edit.autosave.status_on.message">
<source>Autosave is on, draft created %time%</source>
<target state="new">Autosave is on, draft created %time%</target>
<note>key: content_edit.autosave.status_on.message</note>
</trans-unit>
<trans-unit id="da43c85269df161b340e92296642e18ec6af033e" resname="content_edit.autosave.status_saving.message">
<source>Saving</source>
<target state="new">Saving</target>
<note>key: content_edit.autosave.status_saving.message</note>
</trans-unit>
<trans-unit id="02f6ddfcdd8bbd05cdd1b954503a3801288b74eb" resname="content_type.modal.message">
<source>Do you want to delete the Content Type?</source>
<target state="new">Do you want to delete the Content Type?</target>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{% trans_default_domain 'ibexa_content' %}

<div
class="ibexa-autosave
{{ is_enabled ? 'ibexa-autosave--on' : 'ibexa-autosave--off' }}
Expand Down Expand Up @@ -27,9 +29,7 @@
{{ 'content_edit.autosave.status_off.message'|trans()|desc('Autosave is off, draft not created') }}
</div>
<div class="ibexa-autosave__status-on">
{% set current_time = 'now'|date('H:i', ibexa_user_settings.timezone) %}

{{ 'content_edit.autosave.status_on.message'|trans({ '%time%': current_time })|desc('Autosave is on, draft created %time%') }}
{{ 'content_edit.autosave.status_on.message'|trans|desc('Autosave is on, draft created') }}
</div>
<div class="ibexa-autosave__status-saved"></div>
<div class="ibexa-autosave__status-saving">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{% endif %}
</div>
</div>
<div class="col-3 ibexa-edit-header__column ibexa-context-menu-wrapper">
<div class="ibexa-edit-header__column ibexa-context-menu-wrapper">
<div class="ibexa-edit-header__context-actions">
{{ context_actions|default('')|raw }}
</div>
Expand Down

0 comments on commit 9b9b9d4

Please sign in to comment.