Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Missing translation strings #483

Closed
wants to merge 13 commits into from
Closed
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
4 changes: 2 additions & 2 deletions src/app/graphql/queries.graphql.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import gql from 'graphql-tag';

export const CurrentUser = gql`
query{
query getCurrentUser{
userCurrent {
id
bestRank
Expand Down Expand Up @@ -56,7 +56,7 @@ query{
`;

export const profanityList = gql`
query{
query profanityList{
profanityList {
data {
profaneWord
Expand Down
8 changes: 4 additions & 4 deletions src/app/modules/auth-private/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</picture>
</div>
<p class="mb-0 ml-2">Sign in with Google</p>
</button>
</button>
<button class="app-btn facebook ml-3" (click)="redirectTo('facebook')">
<div class="social-img">
<picture>
Expand All @@ -56,7 +56,7 @@
<!-- <div class="form-space-middle col-md-12">
<hr class="horizontal-divider-desktop" data-content="OR"> -->
<!-- horizontal-divider for mobile -->
<!-- <hr class="horizontal-divider" data-content="OR">
<!-- <hr class="horizontal-divider" data-content="OR">
</div> -->


Expand All @@ -78,7 +78,7 @@
<div class="input-box col-12">
<div class="d-flex justify-content-between">
<label for="password">Password</label>
<input class="pull-right" type="button" tabindex="-1" value="Forgot my password" class="forgot-link"
<input class="pull-right" type="button" tabindex="-1" value="{{ 'Forgot my password' | translate }}" class="forgot-link"
[routerLink]="['/auth-private', 'forgot-password']">
</div>
<div class="input-box__border">
Expand All @@ -100,4 +100,4 @@
</div>
</div>

</div>
</div>
22 changes: 11 additions & 11 deletions src/app/modules/auth/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<img class="logo" [routerLink]="['/']" src='assets/images/brand-logo/brand-logo.svg' />
</div>
<div class="sign-up-container">
<p class="auth-text">
<p class="auth-text">
{{"Don't have an account with Civis?" | translate}}
</p>
<button class="app-btn circular auth-btn" [routerLink]="['/auth', 'sign-up']">{{'Sign Up' | translate}}</button>
Expand All @@ -28,7 +28,7 @@
</div>
</div>
<p class="logo-heading">{{'Sign in to your Citizen Leader account' | translate}}</p>

<div class="form-space no-gutters mt-md-5 mt-2">

<div class="row">
Expand All @@ -42,7 +42,7 @@
</picture>
</div>
<p class="mb-0 ml-4">{{'Sign in with Google' | translate}}</p>
</button>
</button>
<button class="app-btn facebook" (click)="redirectTo('facebook')">
<div class="social-img">
<picture>
Expand All @@ -61,7 +61,7 @@
<div class="or-text">{{'OR' | translate}}</div>

<!-- horizontal-divider for mobile -->
<hr class="horizontal-divider" data-content="OR">
<hr class="horizontal-divider" data-content="OR">
</div>
</div>

Expand All @@ -78,19 +78,19 @@
<div *ngIf="email.errors.email">{{'Email must be a valid email address' | translate}}</div>
</div>
</div>

<div class="input-box">
<label for="password">{{'Password' | translate}}</label>
<div class="input-box__border">
<input placeholder="Password" type="password" id="password" #password="ngModel" name="password" [(ngModel)]="loginObject.password" required />
</div>
<div *ngIf="password.invalid && (password.touched || loginForm.submitted)" class="error-msg">{{'Password is Required' | translate}}</div>
</div>

<div>
<input type="button" tabindex="-1" value="Forgot my password" class="forgot-link" [routerLink]="['/auth', 'forgot-password']">
<input type="button" tabindex="-1" value="{{ 'Forgot my password' | translate }}" class="forgot-link" [routerLink]="['/auth', 'forgot-password']">
</div>

<div>
<button class="app-btn secondary get-start-btn" type="submit">
<p class="m-0">{{'SIGN IN TO MY ACCOUNT' | translate}}</p>
Expand All @@ -99,9 +99,9 @@
</div>
</form>
</div>
</div>
</div>
</div>
</div>

</div>

Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
import gql from 'graphql-tag';

const ConsultationPartnerResponsesFragment = gql`
fragment ConsultationPartnerResponsesFragment on ConsultationPartnerResponseType {
responseCount
organisation {
createdAt
employeeCount
id
name
officialUrl
updatedAt
logo {
filename
id
url
}
}
}
`;

export const ConsultationProfile = gql`
query consultationProfile($id: Int!) {
consultationProfile(id: $id) {
Expand All @@ -8,7 +27,7 @@ export const ConsultationProfile = gql`
summary
englishSummary
hindiSummary
responseRounds{
responseRounds {
active
id
questions {
Expand Down Expand Up @@ -57,7 +76,7 @@ export const ConsultationProfile = gql`
answers
consultation {
id
responseRounds{
responseRounds {
active
id
questions {
Expand Down Expand Up @@ -96,8 +115,12 @@ export const ConsultationProfile = gql`
updatedAt
publishedAt
visibility
consultationPartnerResponses {
...ConsultationPartnerResponsesFragment
}
}
}
${ConsultationPartnerResponsesFragment}
`;

export const ConsultationProfileCurrentUser = gql`
Expand All @@ -123,7 +146,7 @@ export const ConsultationProfileCurrentUser = gql`
responseDeadline
readingTime
responsesReadingTimes
responseRounds{
responseRounds {
active
id
questions {
Expand Down Expand Up @@ -171,7 +194,7 @@ export const ConsultationProfileCurrentUser = gql`
answers
consultation {
id
responseRounds{
responseRounds {
active
id
questions {
Expand Down Expand Up @@ -214,8 +237,12 @@ export const ConsultationProfileCurrentUser = gql`
updatedAt
publishedAt
visibility
consultationPartnerResponses {
...ConsultationPartnerResponsesFragment
}
}
}
${ConsultationPartnerResponsesFragment}
`;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="question">
<p class="question-text">
<span class="question-text__number">{{i+1}}.</span>
{{question.questionText}}
{{question.questionText}}
<span *ngIf="!question.isOptional" class="required-text pl-1"> *</span>
</p>
<div class="answer" *ngIf="question.questionType === 'multiple_choice'">
Expand All @@ -23,12 +23,12 @@
<div *ngIf="showError && questionnaireForm.controls[question.id].errors" class="error-msg text-left">This is a mandatory question and your response is required</div>
</div>
<div class="answer" *ngIf="question.questionType === 'dropdown'">
<ng-select
[items]="question.subQuestions" bindLabel="questionText" [virtualScroll]="true" dropdownPosition="bottom"
<ng-select
[items]="question.subQuestions" bindLabel="questionText" [virtualScroll]="true" dropdownPosition="bottom"
bindValue="id" [clearable]="false" loadingText="Searching..." [searchable]="false" (change)="onAnswerChange(question, $event)"
placeholder="Select an option" [formControlName]="question.id">
placeholder="Select an option" [formControlName]="question.id">
</ng-select>
<div *ngIf="showError && questionnaireForm.controls[question.id].errors" class="error-msg text-left">This is a mandatory question and your response is required</div>
<div *ngIf="showError && questionnaireForm.controls[question.id].errors" class="error-msg text-left">This is a mandatory question and your response is required</div>
</div>
<div class="answer" [formGroupName]="question.id" *ngIf="question.questionType === 'checkbox'">
<label class="answer__tips">Choose as many as you like</label>
Expand All @@ -44,33 +44,33 @@
<div class="text-area" >
<textarea (input)="longTextAnswer = $event.target.value" placeholder="Type your answer here." [formControlName]="question.id" ></textarea>
</div>
<div *ngIf="showError && questionnaireForm.controls[question.id].errors" class="error-msg text-left">This is a mandatory question and your response is required</div>
<div *ngIf="showError && questionnaireForm.controls[question.id].errors" class="error-msg text-left">This is a mandatory question and your response is required</div>
</div>
<div class="input-box" *ngIf="question.is_other">
<div class="input-box__border">
<input placeholder="Type answer here" type="text"
[formControlName]="question.other_answer" />
</div>
</div>
<div *ngIf="showError && questionnaireForm.controls[question.other_answer]?.errors && question.is_other" class="error-msg text-left ml-3">This is a mandatory question and your response is required</div>
<div *ngIf="showError && questionnaireForm.controls[question.other_answer]?.errors && question.is_other" class="error-msg text-left ml-3">This is a mandatory question and your response is required</div>
</div>
</div>
</div>
<div class="checkbox-area" *ngIf="showPublicResponseOption() && consultationId !== 707 && consultationId !== 404">
<div class="input-checbox">
<input class="cm-checkbox mr-2" type="checkbox" [(ngModel)]="responseVisibility" [ngModelOptions]="{standalone: true}"/>
<input class="cm-checkbox mr-2" type="checkbox" [(ngModel)]="responseVisibility" [ngModelOptions]="{standalone: true}"/>
<label class="m-0">{{'Make my response public' | translate}}</label>
<span class="link" tooltip="Choosing to make your response public allows it to be viewed by others, who may use it as a reference or template for their
own responses. Only your first name will be disclosed to the organisation conducting the consultation.
This option is ideal for those who wish to transparently share their views and contribute to the broader discussion.
If you are unsure about your own response, you also have the option to adopt and send a public response provided by
<span class="link" tooltip="Choosing to make your response public allows it to be viewed by others, who may use it as a reference or template for their
own responses. Only your first name will be disclosed to the organisation conducting the consultation.
This option is ideal for those who wish to transparently share their views and contribute to the broader discussion.
If you are unsure about your own response, you also have the option to adopt and send a public response provided by
someone else.">{{'What does this mean?' | translate}}</span>
</div>
</div>
<div class="py-3">
<button class="btn-submit active" (click)='submitAnswer()' [tooltip]="(showError && !f.valid) ? 'Please fill all the answers to submit response.' : ''" data-event="purchase">
<p class="m-0">
SUBMIT RESPONSE
{{'SUBMIT RESPONSE' | translate}}
</p>
<span class="ml-2"><i class="fa fa-angle-right"></i></span>
</button>
Expand All @@ -83,4 +83,4 @@
</app-confirm-email-modal>

<app-auth-modal *ngIf="authModal" [consultationId]="consultationId" (close)="authModal = false"></app-auth-modal>
<app-profane-modal *ngIf="isConfirmModal" [message]='confirmMessage' [showCancel]=false (close)='confirmed($event)'></app-profane-modal>
<app-profane-modal *ngIf="isConfirmModal" [message]='confirmMessage' [showCancel]=false (close)='confirmed($event)'></app-profane-modal>
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<div class="input-checbox">
<input class="cm-checkbox mr-2" type="checkbox" [(ngModel)]="responseVisibility" />
<label class="m-0">{{'Make my response public' | translate}}</label>
<span class="link" tooltip="Choosing to make your response public allows it to be viewed by others, who may use it as a reference or
template for their own responses. Only your first name will be disclosed to the organisation conducting the consultation.
This option is ideal for those who wish to transparently share their views and contribute to the broader discussion.
If you are unsure about your own response, you also have the option to adopt and send a
<span class="link" tooltip="Choosing to make your response public allows it to be viewed by others, who may use it as a reference or
template for their own responses. Only your first name will be disclosed to the organisation conducting the consultation.
This option is ideal for those who wish to transparently share their views and contribute to the broader discussion.
If you are unsure about your own response, you also have the option to adopt and send a
public response provided by someone else.">{{'What does this mean?' | translate}}</span>
</div>
<div class="d-flex">
Expand All @@ -49,7 +49,7 @@
<div class="py-3">
<button class="btn-submit active" (click)="submitAnswer()" [tooltip]="(showError && !responseText) ? 'Please fill all the answers to submit response.' : ''" data-event="purchase">
<p class="m-0">
SUBMIT RESPONSE
{{'SUBMIT RESPONSE' | translate}}
</p>
<span class="ml-2"><i class="fa fa-angle-right"></i></span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
.cke {
height: 100% !important;
border: none !important;

.cke_editable.cke_display_version_check-absolute:before {
display: none !important;
}

.cke_inner {
height: 100% !important;
.cke_top {
Expand Down Expand Up @@ -79,4 +84,4 @@
}
}
}
}
}
Loading