Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ export default {
addAttachment: 'Add attachment',
writeSomething: 'Write something...',
sayHello: 'Say hello!',
conciergePlaceholderOptions: [
'Ask for help!',
'Ask me anything!',
'Ask me to book travel!',
'Ask me what I can do!',
'Ask me how to pay people!',
'Ask me how to send an invoice!',
'Ask me how to scan a receipt!',
'Ask me how to get a free corporate card!',
],
blockedFromConcierge: 'Communication is barred',
fileUploadFailed: 'Upload failed. File is not supported.',
localTime: ({user, time}) => `It's ${time} for ${user}`,
Expand Down
10 changes: 10 additions & 0 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ export default {
addAttachment: 'Agregar archivo adjunto',
writeSomething: 'Escribe algo...',
sayHello: 'Di hola!',
conciergePlaceholderOptions: [
'¡Pide ayuda!',
'¡Pregúntame lo que sea!',
'¡Pídeme que te reserve un viaje!',
'¡Pregúntame qué puedo hacer!',
'¡Pregúntame cómo pagar a la gente!',
'¡Pregúntame cómo enviar una factura!',
'¡Pregúntame cómo escanear un recibo!',
'¡Pregúntame cómo obtener una tarjeta de crédito corporativa gratis!',
],
blockedFromConcierge: 'Comunicación no permitida',
fileUploadFailed: 'Subida fallida. El archivo no es compatible.',
localTime: ({user, time}) => `Son las ${time} para ${user}`,
Expand Down
9 changes: 7 additions & 2 deletions src/pages/home/report/ReportActionCompose.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ class ReportActionCompose extends React.Component {
},
maxLines: props.isSmallScreenWidth ? CONST.COMPOSER.MAX_LINES_SMALL_SCREEN : CONST.COMPOSER.MAX_LINES,
value: props.comment,
conciergePlaceholderRandomIndex: _.random(this.props.translate('reportActionCompose.conciergePlaceholderOptions').length - 1),
};
}

Expand Down Expand Up @@ -244,8 +245,12 @@ class ReportActionCompose extends React.Component {
* @return {String}
*/
getInputPlaceholder() {
if (ReportUtils.chatIncludesConcierge(this.props.report) && User.isBlockedFromConcierge(this.props.blockedFromConcierge)) {
return this.props.translate('reportActionCompose.blockedFromConcierge');
if (ReportUtils.chatIncludesConcierge(this.props.report)) {
if (User.isBlockedFromConcierge(this.props.blockedFromConcierge)) {
return this.props.translate('reportActionCompose.blockedFromConcierge');
}

return this.props.translate('reportActionCompose.conciergePlaceholderOptions')[this.state.conciergePlaceholderRandomIndex];
}

if (_.size(this.props.reportActions) === 1) {
Expand Down