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.

Sign up for GitHub

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

440 hard coded text found #442

Merged
merged 7 commits into from
Feb 3, 2017
Merged

440 hard coded text found #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb60efe
Merge pull request #2 from steelyard-nl/437-Hard-coded-text-alert-found
steelyard-nl Feb 1, 2017
4461600
Merge remote-tracking branch 'refs/remotes/pliablepixels/master'
steelyard-nl Feb 2, 2017
9a74711
Timeline hard coded true/false removed
steelyard-nl Feb 2, 2017
75cd89c
Update time-line true / false translated
steelyard-nl Feb 2, 2017
f09ddff
Merge remote-tracking branch 'refs/remotes/origin/master' into 440-Ha…
steelyard-nl Feb 2, 2017
5b7bd82
Removed hard coded PortalUrl placeholder example
steelyard-nl Feb 2, 2017
1f3a41a
Placeholders in templates #440
steelyard-nl Feb 2, 2017
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
6 changes: 6 additions & 0 deletions www/lang/locale-en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"kAll" :"All",
"kAnalyze" :"Analyze",
"kApiUrl" :"ZM api url",
"kApiUrlExample" :"e.g. server/zm/api",
"kApplyingChanges" :"Applying changes. Please wait",
"kArrangingImages" :"arranging images",
"kAt" :"at",
Expand All @@ -22,6 +23,7 @@
"kBannerCannotDeleteNeedOne" :"Cannot delete, need at least one",
"kBannerPinMismatch" :"Pin code mismatch",
"kBannerPleaseCheck" :"Please check settings",
"kBeCareful" :"be careful",
"kBodyPortalNotConfigured" :"Please fill in your login details as well as portal URL and save it before you try to detect the cgi-path",
"kButtonCancel" :"Cancel",
"kButtonClear" :"Clear",
Expand Down Expand Up @@ -91,6 +93,7 @@
"kEventMontage" :"Event Montage",
"kEventMontageImageScale" :"Event Montage image scale",
"kEventNavVidFeeds" :"Event navigation is not available with video feeds. ZoneMinder doesn't yet support them",
"kEventNotificationUrl" :"event notification url",
"kEventRecording" :"Event Recording",
"kEventServer" :"Event Server",
"kEventServerConfig1" :"Please make sure your ZM settings are configured and saved before you configure the event server",
Expand Down Expand Up @@ -144,6 +147,7 @@
"kHideMonsWithoutEvents" :"Hide monitors without events",
"kHideTip" :"hide tip",
"kHighBWDisplay" :"high bandwidth",
"kHours" :"hours",
"kId" :"Id",
"kImages" :"Images",
"kImpMsg1" :"Important Message",
Expand Down Expand Up @@ -241,6 +245,7 @@
"kPTZnotConfigured" :"PTZ not configured for this monitor",
"kPassword" :"password",
"kPathToCgi" :"path to cgi-bin",
"kPathToCgiExample" :"e.g. server/zm/cgi-bin",
"kPause" :"pause",
"kPaused" :"paused",
"kPersistHidden" :"Persist hidden monitors",
Expand Down Expand Up @@ -268,6 +273,7 @@
"kPortalNoticeSub" :"(Swipe right to access the menu)",
"kPortalPleaseSelect" :"Please select",
"kPortalUrl" :"ZM portal url",
"kPortalUrlExample" :"e.g. server/zm",
"kPresets" :"presets",
"kPrev" :"Prev",
"kPrevEvent" :"prev. event",
Expand Down
6 changes: 6 additions & 0 deletions www/lang/locale-nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"kAll" :"Alles",
"kAnalyze" :"Analyseer",
"kApiUrl" :"ZM api url",
"kApiUrlExample" :"bijv. server/zm/api",
"kApplyingChanges" :"Veranderingen toepassen. Even geduld",
"kArrangingImages" :"afbeeldingen rangschikken",
"kAt" :"op",
Expand All @@ -22,6 +23,7 @@
"kBannerCannotDeleteNeedOne" :"Verwijderen onmogelijk, tenminste één benodigd",
"kBannerPinMismatch" :"Foute pincode",
"kBannerPleaseCheck" :"Controleer instellingen",
"kBeCareful" :"voorzichtig",
"kBodyPortalNotConfigured" :"Eerst zowel login gegevens als portaal URL invullen en opslaan voordat u probeerd de cgi-map te detecteren",
"kButtonCancel" :"Annuleren",
"kButtonClear" :"Opschonen",
Expand Down Expand Up @@ -91,6 +93,7 @@
"kEventMontage" :"Event overzicht",
"kEventMontageImageScale" :"Event overzicht afbeelding schalen",
"kEventNavVidFeeds" :"Gebeurtenis navigatie is niet beschikbaar bij video feeds. ZoneMinder ordersteunt dit nog niet",
"kEventNotificationUrl" :"gebeurtenis notificatie url",
"kEventRecording" :"Gebeurtenis opnemen",
"kEventServer" :"Event server",
"kEventServerConfig1" :"Sla eerst uw ZM instellingen op voordat u de event server configureert",
Expand Down Expand Up @@ -144,6 +147,7 @@
"kHideMonsWithoutEvents" :"Verberg monitors zonder gebeurtenissen",
"kHideTip" :"Verberg tip",
"kHighBWDisplay" :"hoge bandbreedte",
"kHours" :"uren",
"kId" :"Id",
"kImages" :"Afbeeldingen",
"kImpMsg1" :"Belangrijke boodschap",
Expand Down Expand Up @@ -241,6 +245,7 @@
"kPTZnotConfigured" :"PTZ niet geconfigureerd voor deze monitori",
"kPassword" :"Wachtwoord",
"kPathToCgi" :"map naar cgi-bin",
"kPathToCgiExample" :"bijv. server/zm/cgi-bin",
"kPause" :"pauze",
"kPaused" :"onderbroken",
"kPersistHidden" :"Aanhoudend verborgen monitoren",
Expand Down Expand Up @@ -268,6 +273,7 @@
"kPortalNoticeSub" :"(Swipe rechts voor menu toegang)",
"kPortalPleaseSelect" :"Maak selectie",
"kPortalUrl" :"ZM portaal url",
"kPortalUrlExample" :"bijv. server/zm",
"kPresets" :"voorinstellingen",
"kPrev" :"Vorige",
"kPrevEvent" :"vorige gebeurtenis",
Expand Down
2 changes: 1 addition & 1 deletion www/templates/devoptions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="item item-text-wrap item-input-inset">
{{'kMaxMonitorsMontage' | translate }}&nbsp;
<label class="item-input-wrapper">
<input type="tel" placeholder="be careful" ng-model="loginData.maxMontage">
<input type="tel" placeholder="{{'kBeCareful' | translate}}" ng-model="loginData.maxMontage">
</label>
</div>
<!--
Expand Down
4 changes: 2 additions & 2 deletions www/templates/eventserversettings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ion-item>
<label class="item item-input item-floating-label" ng-if="loginData.isUseEventServer">
<span class="input-label">{{'kEventServer' | translate}}</span>
<input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="Event notification url" ng-model="loginData.eventServer">
<input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kEventNotificationUrl' | translate}}" ng-model="loginData.eventServer">
</label>
<ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.disablePush" ng-checked="loginData.disablePush" toggle-class="toggle-calm" class="item-text-wrap">{{'kOnlyUseWebSocket'| translate }}
<br/>
Expand Down Expand Up @@ -46,7 +46,7 @@
<ion-item class="item-accordion" ng-show="isGroupShown(monitor)">
<div class="item-input-inset">
<label class="item-input-wrapper">
<input type="tel" placeholder="sec." ng-model="monitor.Monitor.reportingInterval">
<input type="tel" placeholder="{{'kSec' | translate}}" ng-model="monitor.Monitor.reportingInterval">
</label>
&nbsp;{{'kMinimumIntervals' | translate}}
</div>
Expand Down
10 changes: 5 additions & 5 deletions www/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,28 @@
<div ng-if="check.isUseAuth">
<label class="item item-input item-floating-label">
<span class="input-label">{{'kUserName'|translate}}</span>
<input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="username" ng-model="loginData.username">
<input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kUsername' | translate}}" ng-model="loginData.username">
</label>
<label class="item item-input item-floating-label">
<span class="input-label">{{'kPassword' | translate}}</span>
<input type="password" placeholder="password" ng-model="loginData.password">
<input type="password" placeholder="{{'kPassword' | translate}}" ng-model="loginData.password">
</label>
</div>
</div>
<label class="item item-input item-floating-label">
<span class="input-label">{{'kPortalUrl' | translate}}</span>
<input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM portal url " ng-model="loginData.url" ng-keyup="portalKeypress($event)">
<input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kPortalUrlExample' | translate}}" ng-model="loginData.url" ng-keyup="portalKeypress($event)">
</label>
<!--<button class="button button-small button-clear icon-left ion-wand" ng-click="detectCgi()">tap here to discover cgi-bin
</button>-->
<label class="item item-input item-floating-label">
<!--<span style="float:right;margin-top:-7px;background-color:#6d0909;color:#fff;font-size:14px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;" on-tap="detectCgi();">&nbsp;&nbsp;&nbsp;<i class="ion-wand"></i>discover</span>-->
<span class="input-label">{{'kPathToCgi' | translate}}</span>
<input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="eg. server.com/zm/cgi-bin" ng-model="loginData.streamingurl">
<input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kPathToCgiExample' | translate}}" ng-model="loginData.streamingurl">
</label>
<label class="item item-input item-floating-label">
<span class="input-label">{{'kApiUrl' | translate}}</span>
<input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="ZM api url" ng-model="loginData.apiurl">
<input hidepassword autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kApiUrlExample' | translate}}" ng-model="loginData.apiurl">
</label>
<a class="item item-icon-right" href="" ng-click="selectFallback()">
<i class="icon ion-ios-arrow-right">
Expand Down
2 changes: 1 addition & 1 deletion www/templates/montage-history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h1 class="title" ion-pull-up-trigger>{{'kEventMontage' | translate}}</h1>
<div class="row">
<div class="col col-50">
<label class="item-input-wrapper">
<input ng-change="hrsChanged()" type="tel" placeholder="hours" ng-model="datetimeValueFrom.hrs">
<input ng-change="hrsChanged()" type="tel" placeholder="{{'kHours' | translate}}" ng-model="datetimeValueFrom.hrs">
</label>
</div>
<div class="col col-50">
Expand Down
2 changes: 1 addition & 1 deletion www/templates/timeline.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<br/>
<div style="padding-left:15px; font-size:10px; color:grey">
<button ng-click="toggleFollowTime()" ng-class="follow.time? 'button button-small button-balanced':'button button-small button-assertive'">
{{'kUpdateTimeline' | translate}}:&nbsp;{{follow.time}}
{{'kUpdateTimeline' | translate}}:&nbsp;{{follow.time? ('kTrue' | translate) : ('kFalse' | translate)}}
</button>
<button ng-click="gotoNow()" class="button button-small button-balanced">
{{'kNow' | translate}}
Expand Down
2 changes: 1 addition & 1 deletion www/templates/wizard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h4><i id="transition-delay" class="animated swing ion-wand" style="font-size:2e
<p>{{'kWizConfigPain' | translate}}</p>
<h4>{{'kWizPortalUrl' | translate}}</h4>
<label class="item item-input">
<input autocorrect="off" autocapitalize="none" autocomplete="off" type="text" placeholder="e.g. http://server/zm" ng-model="wizard.portalurl">
<input autocorrect="off" autocapitalize="none" autocomplete="off" type="text" placeholder="{{'kPortalUrlExample | translate}}" ng-model="wizard.portalurl">
</label>
<p ng-if="$root.platformOS=='android'" style="font-size:0.8em; color:gray">{{'kDisableSamsung' | translate}}</p>
<a class="button icon-left ion-information-circled button-clear button-dark" ng-click="toggleTip()">{{wizard.tiptext}}</a>
Expand Down