Skip to content

Commit

Permalink
RESOLVE conflic with chat
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesús Said Llamas Manriquez authored and Jesús Said Llamas Manriquez committed Dec 14, 2018
1 parent baea50f commit a19c67a
Show file tree
Hide file tree
Showing 15 changed files with 353 additions and 223 deletions.
2 changes: 1 addition & 1 deletion config.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.saidllamas.madc.cfaf" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.saidllamas.madc.cfaf" version="0.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>College Friend App</name>
<description>An amazing application to talk about public and private universities.</description>
<author email="[email protected]" href="http://saidllamas.com/">Said Llamas</author>
Expand Down
1 change: 1 addition & 0 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export class MyApp {
)
.catch(e => {
translate.setDefaultLang("en");
//translate.setDefaultLang("es");
console.log("error detected lang "+e)
storage.set('lang', 'en');
});
Expand Down
45 changes: 23 additions & 22 deletions src/assets/i18n/en.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"Slides": {
"Inicio": "Start",
"Inicio": "Inicio",
"Creado": "Powered by",
"Como": "How Does It",
"Trabaja": "Work",
"Que": "Welcome to",
"ContentOne": "¿Buscando una universidad? Llegaste a la aplicacion adecuada, entra y conoce tu proxima universidad.",
"ContentTwo": "Con ayuda de personas como tú y como yo, si conoces una universidad ¡registrala! y hazle saber al mundo que opinas de ella."
"ContentOne": "Looking for a university? Get to the right application, enter and know your next university.",
"ContentTwo": "With the help of people like you and me, if you know a university, register it! and let the world know what you think of her."
},
"Tabs": {
"Inicio": "Home",
Expand Down Expand Up @@ -58,7 +58,8 @@
"Opiniones": "Reviews",
"General": "General",
"AñadirCarrera": "add university career",
"EditarMeses": "Edit months"
"EditarMeses": "Edit months",
"Dia": "at"
},
"Opiniones": {
"Opiniones": "Opinions",
Expand All @@ -78,7 +79,7 @@
},
"Chat": {
"Conversaciones": "Conversations",
"Mensajes": "Mensajes",
"Mensajes": "Messages",
"Solicitudes": "Requests"
},
"InboxSingle": {
Expand All @@ -90,18 +91,18 @@
"Actualizar": "update comment"
},
"Meses": {
"Enero": "Enero",
"Febrero": "Febrero",
"Marzo": "Marzo",
"Abril": "Abril",
"Mayo": "Mayo",
"Junio": "Junio",
"Julio": "Julio",
"Agosto": "Agosto",
"Septiembre": "Septiembre",
"Octubre": "Octubre",
"Noviembre": "Noviembre",
"Diciembre": "Diciembre"
"Enero": "January",
"Febrero": "February",
"Marzo": "March",
"Abril": "April",
"Mayo": "May",
"Junio": "June",
"Julio": "July",
"Agosto": "August",
"Septiembre": "September",
"Octubre": "October",
"Noviembre": "November",
"Diciembre": "December"
},
"Ratings": {
"Instalaciones": "Facilities and infrastructure",
Expand All @@ -111,13 +112,13 @@
"Becas": "Scholarships and supports"
},
"Tips": {
"Tip1": "No es posible actualizar tu correo si creaste tu cuenta desde una red social.",
"Tip2": "Si quieres actualizar tu nombre y usaste el login con redes sociales es necesario que lo actualices desde la red social con la que iniciaste sesion.",
"Tip3": "Para actualizar tu foto de perfil es necesario que te dirigas a gravatar.com y registres el mismo correo que usas en esta aplicacion.",
"Tip4": "Si se puede imaginar se puede programar",
"Tip1": "It is not possible to update your email if you created your account from a social network.",
"Tip2": "If you want to update your name and you used the login with social networks it is necessary that you update it from the social network with which you started session.",
"Tip3": "To update your profile picture it is necessary that you go to gravatar.com and register the same mail that you use in this application.",
"Tip4": "If you can imagine it can be programmed",
"Tip5": "Powered by DamVeloper Team"
},
"Favoritos": {
"misFavs": "Mis favoritas"
"misFavs": "My favourites"
}
}
31 changes: 16 additions & 15 deletions src/assets/i18n/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"Ver": "Ver",
"Crear": "Crear",
"TituloResEnd": "Aquí los resultados terminan…",
"ContenidoResEnd": "If it was not what you were looking for help us to register it",
"ContenidoResNo": "Help us see this university next time",
"TituloResNo": "Without result"
"ContenidoResEnd": "Si no era lo que buscabas, ayúdanos a registrarlo.",
"ContenidoResNo": "Ayúdanos a ver esta universidad la próxima vez.",
"TituloResNo": "Sin resultados"
},
"Perfil": {
"user_name": "Nombre",
Expand All @@ -47,26 +47,27 @@
"Mapa": "Mapa",
"Opinar": "opinar",
"Ubicacion": "Ubicación",
"Buscar": "Search",
"Guardar": "Save",
"CreadoPor": "Created by",
"Global": "Global score",
"Carreras": "university careers",
"Inicio": "Start of courses",
"Buscar": "Buscar",
"Guardar": "Guardar",
"CreadoPor": "Creada por",
"Global": "Puntaje",
"Carreras": "Carreras universitarias",
"Inicio": "Inicio de clases",
"Costo": "Registration cost",
"Puntajes": "Scores",
"Opiniones": "Reviews",
"Puntajes": "Puntajes",
"Opiniones": "Opiniones",
"General": "General",
"AñadirCarrera": "add university career",
"EditarMeses": "Edit months"
"AñadirCarrera": "añadir una carrera",
"EditarMeses": "editar mes",
"Dia": "el"
},
"Opiniones": {
"Opiniones": "Opiniones",
"Actualizar": "Update review a"
},
"Errores": {
"Error": "An error has occurred",
"Mensaje": "… our programmers are working to solve it"
"Error": "Se ha producido un error",
"Mensaje": "… nuestros programadores están trabajando para resolverlo."
},
"Login": {
"Nombre": "Nombre completo",
Expand Down
96 changes: 49 additions & 47 deletions src/pages/create-university/create-university.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,57 @@
<button (click)="addPicture()" class="btn-addPic"><ion-icon class="icon" name="camera"></ion-icon> </button>
</div>
<div padding>
<ion-grid>
<ion-row>
<ion-col>
<div>
<img *ngFor="let image of imagesTmp" [src]="image" class="tmpImg" height="100px" width="100px">
</div>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<label>{{"Perfil.user_name" | translate}}</label>
<input [(ngModel)]="nameUniversity" type="text" placeholder="Instituto Tecnológico de Ciudad Guzmán">
</ion-col>
</ion-row>
<br>
<ion-row>
<ion-col>
<label>{{"Universidad.Telefono" | translate}} </label>
<input [(ngModel)]="phoneUniversity" type="tel" placeholder="+52 341 554 1352">
</ion-col>
</ion-row>
<br>
<ion-row>
<ion-col>
<label>{{"Universidad.Sitioweb" | translate}}</label>
<input [(ngModel)]="website" type="text" placeholder="www.itcg.edu.mx">
</ion-col>
</ion-row>
<br>
<ion-row>
<ion-col>
<ion-row>
<div id="map_canvas">
<table>
<tr>
<td><input ion-input type="text" #search_address><button ion-button (click)="onButton1_click($event)">{{"Buscar" | translate}}</button></td>
</tr>
</table>
<form novalidate (ngSubmit)="saveUniversity()" [formGroup]="formGroup">
<ion-grid>
<ion-row>
<ion-col>
<div>
<img *ngFor="let image of imagesTmp" [src]="image" class="tmpImg" height="100px" width="100px">
</div>
</ion-row>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<label>{{"Perfil.user_name" | translate}}</label>
<input formControlName="nombre" [(ngModel)]="nameUniversity" type="text" placeholder="Instituto Tecnológico de Ciudad Guzmán">
</ion-col>
</ion-row>
<br>
<ion-row>
<ion-col>
<label>{{"Universidad.Telefono" | translate}} </label>
<input formControlName="telefono" [(ngModel)]="phoneUniversity" type="tel" placeholder="+52 341 554 1352">
</ion-col>
</ion-row>
<br>
<ion-row>
<ion-col>
<label>{{"Universidad.Sitioweb" | translate}}</label>
<input formControlName="website" [(ngModel)]="website" type="text" placeholder="www.itcg.edu.mx">
</ion-col>
</ion-row>
<br>
<ion-row>
<ion-col>
<ion-row>
<div id="map_canvas">
<table>
<tr>
<td><input formControlName="direccion" ion-input type="text" #search_address><button ion-button (click)="onButton1_click($event)">{{"Buscar" | translate}}</button></td>
</tr>
</table>
</div>
</ion-row>

</ion-col>
</ion-row>
<ion-row>
<ion-col>
<button (click)="saveUniversity()" class="btn btn-save">{{"Guardar" | translate}}</button>
</ion-col>
</ion-row>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<button type="submit" class="btn btn-save">{{"Guardar" | translate}}</button>
</ion-col>
</ion-row>

</ion-grid>
</ion-grid>
</form>
</div>
</ion-content>
Loading

0 comments on commit a19c67a

Please sign in to comment.