dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Typo occured -> occurred

Browse Source
master
Daniel Berteaud 11 years ago
parent 7c90b688f4
commit 581889f559
4 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lib/Vroom/I18N/en.pm
  2. 2
      lib/Vroom/I18N/fr.pm
  3. 30
      public/js/vroom.js
  4. 18
      public/vroom.pl

2
lib/Vroom/I18N/en.pm
Unescape View File

@ -10,7 +10,7 @@ our %Lexicon = (
"ERROR_NAME_CONFLICT" => "A room with this name already exists, please choose another one",
"ERROR_ROOM_s_DOESNT_EXIST" => "The room %s doesn't exist",
"ERROR_ROOM_s_LOCKED" => "The room %s is locked, you cannot join it",
"ERROR_OCCURED" => "An error occured",
"ERROR_OCCURRED" => "An error occurred",
"ERROR_NOT_LOGGED_IN" => "Sorry, your not logged in",
"EMAIL_INVITATION" => "Video conference invitation",
"INVITE_SENT_TO_s" => "An invitation was sent to %s",

2
lib/Vroom/I18N/fr.pm
Unescape View File

@ -12,7 +12,7 @@ our %Lexicon = (
"ERROR_NAME_CONFLICT" => "Ce nom est déjà pris, choisissez en un autre",
"ERROR_ROOM_s_DOESNT_EXIST" => "Le salon %s n'existe pas",
"ERROR_ROOM_s_LOCKED" => "Le salon %s est verrouillé, vous ne pouvez pas le rejoindre",
"ERROR_OCCURED" => "Une erreur est survenue",
"ERROR_OCCURRED" => "Une erreur est survenue",
"ERROR_NOT_LOGGED_IN" => "Désolé, vous n'êtes pas identifié",
"EMAIL_INVITATION" => "Invitation à une conférence vidéo",
"YOU_ARE_INVITED_TO_A_MEETING" => "Vous êtes attendu sur un salon de vidéo conférence. " .

30
public/js/vroom.js
Unescape View File

@ -20,7 +20,7 @@ $('.dropdown').on('hide.bs.dropdown', function(e){
// Strings we need translated
var locale = {
ERROR_MAIL_INVALID: '',
ERROR_OCCURED: '',
ERROR_OCCURRED: '',
CANT_SHARE_SCREEN: '',
SCREEN_SHARING_ONLY_FOR_CHROME: '',
SCREEN_SHARING_CANCELLED: '',
@ -120,7 +120,7 @@ function removeNotifiedEmail(email){
room: roomName
},
error: function() {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
if (data.status == 'success'){
@ -279,7 +279,7 @@ function initVroom(room) {
},
async: false,
error: function(data){
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data){
// Notify others if our role changed
@ -337,7 +337,7 @@ function initVroom(room) {
id: id
},
error: function(data){
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data){
if (peers[id]){
@ -1029,7 +1029,7 @@ function initVroom(room) {
name: (peers.local.hasName) ? peers.local.displayName : ''
},
error: function(data) {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
if (data.status == 'success' && data.msg){
@ -1118,7 +1118,7 @@ function initVroom(room) {
room: roomName
},
error: function(data) {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
$('#recipient').val('');
@ -1199,7 +1199,7 @@ function initVroom(room) {
room: roomName
},
error: function(data) {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
if (data.status == 'success'){
@ -1232,7 +1232,7 @@ function initVroom(room) {
room: roomName
},
error: function(data) {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
if (data.status == 'success'){
@ -1352,7 +1352,7 @@ function initVroom(room) {
room: roomName
},
error: function(data) {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
$('#authPass').val('');
@ -1400,7 +1400,7 @@ function initVroom(room) {
room: roomName
},
error: function() {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
$('#joinPass').val('');
@ -1433,7 +1433,7 @@ function initVroom(room) {
room: roomName
},
error: function() {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
$('#joinPass').val('');
@ -1474,7 +1474,7 @@ function initVroom(room) {
room: roomName
},
error: function() {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
$('#ownerPass').val('');
@ -1518,7 +1518,7 @@ function initVroom(room) {
room: roomName
},
error: function() {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
$('#persistentLabel').removeClass('btn-danger active');
},
success: function(data) {
@ -1563,7 +1563,7 @@ function initVroom(room) {
room: roomName
},
error: function() {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
if (data.status == 'success'){
@ -1680,7 +1680,7 @@ function initVroom(room) {
room: roomName
},
error: function(data) {
$.notify(locale.ERROR_OCCURED, 'error');
$.notify(locale.ERROR_OCCURRED, 'error');
},
success: function(data) {
if (data.status == 'success' && data.msg && data.msg != ''){

18
public/vroom.pl
Unescape View File

@ -776,8 +776,8 @@ get '/(*room)' => sub {
# Add this user to the participants table
unless($self->add_participant($room,$self->session('name'))){
return $self->render('error',
msg => $self->l('ERROR_OCCURED'),
err => 'ERROR_OCCURED',
msg => $self->l('ERROR_OCCURRED'),
err => 'ERROR_OCCURRED',
room => $room
);
}
@ -828,7 +828,7 @@ post '/action' => sub {
my $rcpt = $self->param('recipient');
my $message = $self->param('message');
my $status = 'error';
my $msg = $self->l('ERROR_OCCURED');
my $msg = $self->l('ERROR_OCCURRED');
if (!$self->session($room) || $self->session($room)->{role} ne 'owner'){
$msg = 'NOT_ALLOWED';
}
@ -864,7 +864,7 @@ post '/action' => sub {
# Handle room lock/unlock
if ($action =~ m/(un)?lock/){
my ($lock,$success);
my $msg = 'ERROR_OCCURED';
my $msg = 'ERROR_OCCURRED';
my $status = 'error';
# Only the owner can lock or unlock a room
if (!$self->session($room) || $self->session($room)->{role} ne 'owner'){
@ -884,7 +884,7 @@ post '/action' => sub {
# Handle activity pings sent every minute by each participant
elsif ($action eq 'ping'){
my $status = 'error';
my $msg = $self->l('ERROR_OCCURED');
my $msg = $self->l('ERROR_OCCURRED');
my $res = $self->ping_room($room);
# Cleanup expired rooms every ~10 pings
if ((int (rand 100)) <= 10){
@ -931,7 +931,7 @@ post '/action' => sub {
# Empty password is equivalent to no password at all
$pass = undef if ($pass && $pass eq '');
my $res = undef;
my $msg = $self->l('ERROR_OCCURED');
my $msg = $self->l('ERROR_OCCURRED');
my $status = 'error';
# Once again, only the owner can do this
if ($self->session($room)->{role} eq 'owner'){
@ -965,7 +965,7 @@ post '/action' => sub {
elsif ($action eq 'authenticate'){
my $pass = $self->param('password');
my $res = undef;
my $msg = $self->l('ERROR_OCCURED');
my $msg = $self->l('ERROR_OCCURRED');
my $status = 'error';
# Auth succeed ? lets promote him to owner of the room
if ($data->{owner_password} && Crypt::SaltedHash->validate($data->{owner_password}, $pass)){
@ -1028,7 +1028,7 @@ post '/action' => sub {
my $email = $self->param('email');
my $type = $self->param('type');
my $status = 'error';
my $msg = $self->l('ERROR_OCCURED');
my $msg = $self->l('ERROR_OCCURRED');
if ($self->session($room)->{role} ne 'owner'){
$msg = $self->l('NOT_ALLOWED');
}
@ -1054,7 +1054,7 @@ post '/action' => sub {
elsif ($action eq 'askForName'){
my $type = $self->param('type');
my $status = 'error';
my $msg = $self->l('ERROR_OCCURED');
my $msg = $self->l('ERROR_OCCURRED');
if ($self->session($room)->{role} ne 'owner'){
$msg = $self->l('NOT_ALLOWED');
}

Write Preview
Loading…
Cancel
Save