Skip to content

Commit

Permalink
remplacement anglais -> français
Browse files Browse the repository at this point in the history
  • Loading branch information
squatteur committed Dec 5, 2017
1 parent 314ef05 commit 0c3ebb9
Show file tree
Hide file tree
Showing 18 changed files with 63 additions and 64 deletions.
4 changes: 2 additions & 2 deletions src/pages/buddies/buddies.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Buddies</ion-title>
<ion-title>Restochatteurs</ion-title>
</ion-navbar>

</ion-header>
Expand All @@ -27,7 +27,7 @@ <h2>{{key.displayName}}</h2>
<ion-item-options slide="left">
<button ion-button color="primary" (click)="sendreq(key)">
<ion-icon name="person-add"></ion-icon>
Add
AJOUT
</button>
</ion-item-options>

Expand Down
2 changes: 1 addition & 1 deletion src/pages/buddychat/buddychat.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h3 *ngIf="!imgornot[i]">{{item.message}}</h3>
</ion-content>
<ion-footer ion-fixed>
<ion-toolbar class="no-border" color="white">
<ion-input [(ngModel)]="newmessage" placeholder="Write your message ..."></ion-input>
<ion-input [(ngModel)]="newmessage" placeholder="Écris un message ..."></ion-input>
<ion-buttons end>
<button ion-button (click)="addmessage()">
<ion-icon name="send" color="primary"></ion-icon>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/chats/chats.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ion-content padding>
<ion-list no-lines>
<ion-list-header>
Requests
Requêtes
</ion-list-header>
<ion-item-sliding *ngFor="let item of myrequests">
<ion-item>
Expand All @@ -33,16 +33,16 @@ <h4>{{item.displayName}}</h4>
<ion-item-options>
<button ion-button color="secondary" (click)="accept(item)">
<ion-icon name="checkmark"></ion-icon>
ADD
AJOUT
</button>
<button ion-button color="danger" (click)="ignore(item)">
<ion-icon name="trash"></ion-icon>
NOPE
REFUS
</button>
</ion-item-options>
</ion-item-sliding>
<ion-list-header>
Friends
Ami-es
</ion-list-header>
<ion-item *ngFor="let item of myfriends" (click)="buddychat(item)">
<ion-avatar item-left>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/groupbuddies/groupbuddies.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Group Buddies</ion-title>
<ion-title>Groupe de restochatteurs</ion-title>
</ion-navbar>

</ion-header>


<ion-content>
<ion-searchbar [(ngModel)]="searchstring" (input)="searchuser($event)"
placeholder="Search">
placeholder="Recherche">
</ion-searchbar>
<ion-list no-lines>
<ion-item-sliding *ngFor="let key of myfriends">
Expand All @@ -28,7 +28,7 @@ <h2>{{key.displayName}}</h2>
<ion-item-options slide="left">
<button ion-button color="primary" (click)="addbuddy(key)">
<ion-icon name="person-add"></ion-icon>
Add
Ajouter
</button>
</ion-item-options>
</ion-item-sliding>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/groupchat/groupchat.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h3 *ngIf="!imgornot[i]">{{item.message}}</h3>
</ion-content>
<ion-footer ion-fixed>
<ion-toolbar class="no-border" color="white">
<ion-input [(ngModel)]="newmessage" placeholder="Write your message ..."></ion-input>
<ion-input [(ngModel)]="newmessage" placeholder="Écris ton message ..."></ion-input>
<ion-buttons end>
<button ion-button (click)="addgroupmsg()">
<ion-icon name="send" color="primary"></ion-icon>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/groupinfo/groupinfo.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Group Info</ion-title>
<ion-title>Informations sur le groupe</ion-title>
</ion-navbar>

</ion-header>
Expand All @@ -16,14 +16,14 @@
<ion-content>
<ion-list no-lines>
<ion-list-header>
Group Members
Membres du groupe
</ion-list-header>
<ion-item *ngFor="let item of groupmembers">
<ion-avatar item-left>
<img src="{{item.photoURL}}">
</ion-avatar>
<h2>{{item.displayName}}</h2>
<p>Member</p>
<p>Membre</p>
</ion-item>
</ion-list>

Expand Down
6 changes: 3 additions & 3 deletions src/pages/groupmembers/groupmembers.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Group Members</ion-title>
<ion-title>Les membres du groupe</ion-title>
</ion-navbar>

</ion-header>


<ion-content>
<ion-searchbar [(ngModel)]="searchstring" (input)="searchuser($event)"
placeholder="Search">
placeholder="Recherche">
</ion-searchbar>
<ion-list no-lines>
<ion-item-sliding *ngFor="let key of groupmembers">
Expand All @@ -28,7 +28,7 @@ <h2>{{key.displayName}}</h2>
<ion-item-options slide="left">
<button ion-button color="danger" (click)="removemember(key)">
<ion-icon name="trash"></ion-icon>
Remove
Supprimer
</button>
</ion-item-options>
</ion-item-sliding>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/groups/groups.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Groups</ion-title>
<ion-title>Groupes</ion-title>
<ion-buttons end>
<button ion-button icon-only (click)="addgroup()">
<ion-icon name="contacts"></ion-icon>
Expand All @@ -21,7 +21,7 @@
<ion-content>
<ion-list no-lines>
<ion-list-header>
My Groups
Mes Groupes
</ion-list-header>
<ion-item *ngFor="let item of allmygroups">
<ion-avatar item-left>
Expand Down
12 changes: 6 additions & 6 deletions src/pages/login/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ion-content class="background">
<ion-card>
<ion-card-header>
Login
Connectez-vous à RestoChat
</ion-card-header>
<ion-card-content>
<ion-list no-lines>
Expand All @@ -24,16 +24,16 @@
</ion-item>
<div class="spacer" style="height: 5px;"></div>
<ion-item>
<ion-input type="password" placeholder="Password" [(ngModel)]="credentials.password"></ion-input>
<ion-input type="password" placeholder="Mot de passe" [(ngModel)]="credentials.password"></ion-input>
</ion-item>
<div class="spacer" style="height: 10px;"></div>
<a (click)="passwordreset()">Forgot login details ? <b> Get Help </b></a>
<a (click)="passwordreset()">Identifiant oublié ? <b> Obtenir de l'aide </b></a>
<div class="spacer" style="height: 10px;"></div>
<button ion-button block round outline color="light" (click)="signin()">Login</button>
<button ion-button block round outline color="light" (click)="signin()">Connexion</button>
<div class="spacer" style="height: 10px;"></div>
<p>OR</p>
<p>OU</p>
<div class="spacer" style="height: 10px;"></div>
<button ion-button clear full color="light" (click)="signup()">Don't have an account? Sign up</button>
<button ion-button clear full color="light" (click)="signup()">Vous n'avez pas encore de compte?</button>
</ion-list>
</ion-card-content>
</ion-card>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/newgroup/newgroup.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Add a New Group</ion-title>
<ion-title>Ajouter un nouveau groupe</ion-title>
</ion-navbar>

</ion-header>
Expand All @@ -21,10 +21,10 @@
<h2 (click)="editgroupname()">{{newgroup.groupName}}</h2>
</div>
<div>
Tap on the pic or group name to change it.
Appuyez sur le nom de l'image ou du groupe pour le modifier.
</div>
<div class="spacer" style="height: 10px;"></div>
<div>
<button ion-button round outline (click)="creategroup()">Create</button>
<button ion-button round outline (click)="creategroup()">Créer</button>
</div>
</ion-content>
6 changes: 3 additions & 3 deletions src/pages/passwordreset/passwordreset.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<ion-content class="background">
<ion-card>
<ion-card-header>
Password Reset
Réinitialiser le mot de passe
</ion-card-header>
<ion-card-content>
<ion-list >
<ion-item>
<ion-input type="email" [(ngModel)]="email" placeholder="Email"></ion-input>
</ion-item>
<button ion-button block round outline color="light" (click)="reset()">Reset my Password</button>
<button ion-button full clear color="light" (click)="goback()">Go Back</button>
<button ion-button block round outline color="light" (click)="reset()">Réinitialiser mon mot de passe</button>
<button ion-button full clear color="light" (click)="goback()">Retour</button>
</ion-list>
</ion-card-content>
</ion-card>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/passwordreset/passwordreset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ export class PasswordresetPage {
});
this.userservice.passwordreset(this.email).then((res: any) => {
if (res.success) {
alert.setTitle('Email Sent');
alert.setSubTitle('Please follow the instructions in the email to reset your password');
alert.setTitle('Email envoyé');
alert.setSubTitle('Veuillez suivre les instructions dans l\'email pour réinitialiser votre mot de passe');
}
}).catch((err) => {
alert.setTitle('Failed');
alert.setTitle('Echec');
alert.setSubTitle(err);
})
}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/profile/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Profile</ion-title>
<ion-title>Profil</ion-title>
</ion-navbar>

</ion-header>
Expand All @@ -21,10 +21,10 @@
<h2 (click)="editname()">{{displayName}}</h2>
</div>
<div>
Tap on your pic or nick name to change it.
Tapez sur votre photo ou pseudo pour le changer.
</div>
<div class="spacer" style="height: 10px;"></div>
<div>
<button ion-button round outline color="danger" (click)="logout()">Logout</button>
<button ion-button round outline color="danger" (click)="logout()">Déconnexion</button>
</div>
</ion-content>
26 changes: 13 additions & 13 deletions src/pages/profile/profile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ export class ProfilePage {
this.imghandler.uploadimage().then((url: any) => {
this.userservice.updateimage(url).then((res: any) => {
if (res.success) {
statusalert.setTitle('Updated');
statusalert.setSubTitle('Your profile pic has been changed successfully!!');
statusalert.setTitle('Actualisé');
statusalert.setSubTitle('Votre photo de profil a été modifiée avec succès !!');
statusalert.present();
this.zone.run(() => {
this.avatar = url;
})
}
}).catch((err) => {
statusalert.setTitle('Failed');
statusalert.setSubTitle('Your profile pic was not changed');
statusalert.setTitle('Échoué');
statusalert.setSubTitle('Votre photo de profil n\'a pas été modifiée');
statusalert.present();
})
})
Expand All @@ -62,35 +62,35 @@ export class ProfilePage {
buttons: ['okay']
});
let alert = this.alertCtrl.create({
title: 'Edit Nickname',
title: 'Éditer votre pseudo',
inputs: [{
name: 'nickname',
placeholder: 'Nickname'
name: 'pseudo',
placeholder: 'Pseudo'
}],
buttons: [{
text: 'Cancel',
text: 'Annuler',
role: 'cancel',
handler: data => {

}
},
{
text: 'Edit',
text: 'Éditer',
handler: data => {
if (data.nickname) {
this.userservice.updatedisplayname(data.nickname).then((res: any) => {
if (res.success) {
statusalert.setTitle('Updated');
statusalert.setSubTitle('Your nickname has been changed successfully!!');
statusalert.setTitle('Actualisé');
statusalert.setSubTitle('Votre pseudo a été changé avec succès !!');
statusalert.present();
this.zone.run(() => {
this.displayName = data.nickname;
})
}

else {
statusalert.setTitle('Failed');
statusalert.setSubTitle('Your nickname was not changed');
statusalert.setTitle('Échoué');
statusalert.setSubTitle('Votre pseudo n\'a pas été modifié');
statusalert.present();
}

Expand Down
8 changes: 4 additions & 4 deletions src/pages/profilepic/profilepic.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ion-header>

<ion-navbar color="hcolor">
<ion-title>Profile Picture</ion-title>
<ion-title>Image de profil</ion-title>
</ion-navbar>

</ion-header>
Expand All @@ -18,12 +18,12 @@
<img src="{{imgurl}}">
</div>
<div>
<button ion-button round outline (click)="chooseimage()">Choose an image</button>
<button ion-button round outline (click)="chooseimage()">Choisir une image</button>
</div>
<div [hidden]="!moveon">
<button ion-button round outline (click)="proceed()">Skip this step</button>
<button ion-button round outline (click)="proceed()">Passer cette étape</button>
</div>
<div [hidden]="moveon">
<button ion-button round outline (click)="updateproceed()">Upload & proceed</button>
<button ion-button round outline (click)="updateproceed()">Télécharger et continuer</button>
</div>
</ion-content>
10 changes: 5 additions & 5 deletions src/pages/signup/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
<ion-content class="background">
<ion-card>
<ion-card-header>
Signup
S'inscrire
</ion-card-header>
<ion-card-content>
<ion-list>
<ion-item>
<ion-input type="email" placeholder="Email" [(ngModel)]="newuser.email"></ion-input>
</ion-item>
<ion-item>
<ion-input type="password" placeholder="Password" [(ngModel)]="newuser.password"></ion-input>
<ion-input type="password" placeholder="Mot de passe" [(ngModel)]="newuser.password"></ion-input>
</ion-item>
<ion-item>
<ion-input type="text" placeholder="Nick Name" [(ngModel)]="newuser.displayName"></ion-input>
<ion-input type="text" placeholder="Pseudo" [(ngModel)]="newuser.displayName"></ion-input>
</ion-item>
<button ion-button block round outline color="light" (click)="signup()">Sign Up</button>
<button ion-button full clear color="light" (click)="goback()">Go Back</button>
<button ion-button block round outline color="light" (click)="signup()">S'inscrire</button>
<button ion-button full clear color="light" (click)="goback()">Retour</button>
</ion-list>
</ion-card-content>
</ion-card>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/tabs/tabs.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ion-tabs color="hcolor">
<ion-tab [root]="tab1" tabTitle="Chats" tabIcon="chatbubbles" tabsHideOnSubPages="true"></ion-tab>
<ion-tab [root]="tab2" tabTitle="Groups" tabIcon="contacts" tabsHideOnSubPages="true"></ion-tab>
<ion-tab [root]="tab3" tabTitle="Profile" tabIcon="contact"></ion-tab>
<ion-tab [root]="tab2" tabTitle="Groupes" tabIcon="contacts" tabsHideOnSubPages="true"></ion-tab>
<ion-tab [root]="tab3" tabTitle="Profil" tabIcon="contact"></ion-tab>
</ion-tabs>
Loading

0 comments on commit 0c3ebb9

Please sign in to comment.