Skip to content

Commit

Permalink
Merge pull request Expensify#14383 from jatinsonijs/allow-capital-let…
Browse files Browse the repository at this point in the history
…ters-in-room-name

Allow capital letters in room name
  • Loading branch information
madmax330 authored Jan 19, 2023
2 parents 43cb545 + af406df commit 8947130
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ export default {
createRoom: 'Create room',
roomAlreadyExistsError: 'A room with this name already exists',
roomNameReservedError: 'A room on this workspace already uses this name',
roomNameInvalidError: 'Room names can only contain letters, numbers and hyphens',
roomNameInvalidError: 'Room names can only include lowercase letters, numbers and hyphens',
pleaseEnterRoomName: 'Please enter a room name',
pleaseSelectWorkspace: 'Please select a workspace',
renamedRoomAction: ({oldName, newName}) => ` renamed this room from ${oldName} to ${newName}`,
Expand Down
2 changes: 1 addition & 1 deletion src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ export default {
createRoom: 'Crea una sala de chat',
roomAlreadyExistsError: 'Ya existe una sala con este nombre',
roomNameReservedError: 'Una sala en este espacio de trabajo ya usa este nombre',
roomNameInvalidError: 'Los nombres de las salas solo pueden contener letras, números y guiones',
roomNameInvalidError: 'Los nombres de las salas solo pueden contener minúsculas, números y guiones',
pleaseEnterRoomName: 'Por favor, escribe el nombre de una sala',
pleaseSelectWorkspace: 'Por favor, selecciona un espacio de trabajo',
renamedRoomAction: ({oldName, newName}) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
Expand Down
7 changes: 2 additions & 5 deletions src/libs/RoomNameInputUtils.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import CONST from '../CONST';

/**
* Modifies the room name in the following ways:
* - Replaces spaces with dashes
* - Makes all letters lowercase
* Replaces spaces with dashes
*
* @param {String} roomName
* @returns {String}
*/
function modifyRoomName(roomName) {
const modifiedRoomNameWithoutHash = roomName
.replace(/ /g, '-')
.toLowerCase();
.replace(/ /g, '-');

return `${CONST.POLICY.ROOM_PREFIX}${modifiedRoomNameWithoutHash}`;
}
Expand Down

0 comments on commit 8947130

Please sign in to comment.