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

PR741 Finish translation code changes, make fixes, add tooltips #741

Merged
merged 4 commits into from
May 17, 2024
Merged

PR741 Finish translation code changes, make fixes, add tooltips #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea7965b
Remove *wrong* translations and synch other languages
TimRudy May 10, 2024
c7773ab
More minor name changes and remove *wrong* translations
TimRudy May 16, 2024
c01f8f7
Add tooltips to Label finder, add more translations
TimRudy May 17, 2024
7c041d2
Another name change
TimRudy May 17, 2024
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
239 changes: 123 additions & 116 deletions app/resources/locale/ca_ES/ca_ES.po
View file
Open in desktop

Large diffs are not rendered by default.

219 changes: 119 additions & 100 deletions app/resources/locale/cs_CZ/cs_CZ.po
View file
Open in desktop

Large diffs are not rendered by default.

211 changes: 114 additions & 97 deletions app/resources/locale/de_DE/de_DE.po
View file
Open in desktop

Large diffs are not rendered by default.

244 changes: 130 additions & 114 deletions app/resources/locale/el_GR/el_GR.po
View file
Open in desktop

Large diffs are not rendered by default.

209 changes: 111 additions & 98 deletions app/resources/locale/en/en.po
View file
Open in desktop

Large diffs are not rendered by default.

202 changes: 108 additions & 94 deletions app/resources/locale/es_ES/es_ES.po
View file
Open in desktop

Large diffs are not rendered by default.

255 changes: 128 additions & 127 deletions app/resources/locale/eu_ES/eu_ES.po
View file
Open in desktop

Large diffs are not rendered by default.

264 changes: 137 additions & 127 deletions app/resources/locale/fr_FR/fr_FR.po
View file
Open in desktop

Large diffs are not rendered by default.

230 changes: 117 additions & 113 deletions app/resources/locale/gl_ES/gl_ES.po
View file
Open in desktop

Large diffs are not rendered by default.

218 changes: 112 additions & 106 deletions app/resources/locale/it_IT/it_IT.po
View file
Open in desktop

Large diffs are not rendered by default.

208 changes: 115 additions & 93 deletions app/resources/locale/ja_JP/ja_JP.po
View file
Open in desktop

Large diffs are not rendered by default.

225 changes: 117 additions & 108 deletions app/resources/locale/ko_KR/ko_KR.po
View file
Open in desktop

Large diffs are not rendered by default.

222 changes: 114 additions & 108 deletions app/resources/locale/nl_NL/nl_NL.po
View file
Open in desktop

Large diffs are not rendered by default.

224 changes: 114 additions & 110 deletions app/resources/locale/ru_RU/ru_RU.po
View file
Open in desktop

Large diffs are not rendered by default.

196 changes: 104 additions & 92 deletions app/resources/locale/template.pot
View file
Open in desktop

Large diffs are not rendered by default.

232 changes: 118 additions & 114 deletions app/resources/locale/tr_TR/tr_TR.po
View file
Open in desktop

Large diffs are not rendered by default.

227 changes: 116 additions & 111 deletions app/resources/locale/zh_CN/zh_CN.po
View file
Open in desktop

Large diffs are not rendered by default.

217 changes: 111 additions & 106 deletions app/resources/locale/zh_TW/zh_TW.po
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/resources/viewers/system/system.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="css/style.css">
<script src="js/system.js" defer></script>
<script src="js/system.js" defer></script>
</head>
<body>
<h3>Icestudio version: <span id="disp_version"></span></h3>
<h3>Computer:</h3>
<ul>
<li>Architecture: <span id="disp_arch"></span> </li>
<li>Platform: <span id="disp_platform"></span></li>
<li>Architecture: <span id="disp_arch"></span> </li>
<li>Platform: <span id="disp_platform"></span></li>
</ul>

<h3>PATHs:</h3>
Expand Down
14 changes: 8 additions & 6 deletions app/scripts/services/forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ angular.module('icestudio')
constructor(name = '', virtual = false, clock = false, disabled = false, inoutValue = undefined) {

//-- Create a blank BasicPortForm (calling the upper Class)
super(gettextCatalog.getString('Input port name:'),
super(gettextCatalog.getString('Input port name'),
name,
virtual,
disabled);
Expand All @@ -1010,7 +1010,7 @@ angular.module('icestudio')
//-- Field 3: Checkbox for configuring the pin as inout
if (inoutValue !== undefined) {
let field3 = new CheckboxField(
gettextCatalog.getString('InOut pin'),
gettextCatalog.getString('\"Inout\" pin'),
inoutValue, //-- Default value
3 //-- Field id
);
Expand Down Expand Up @@ -1145,7 +1145,7 @@ angular.module('icestudio')
//-- Field 2: Checkbox for configuring the pin as inout
if (inoutValue !== undefined) {
let field2 = new CheckboxField(
gettextCatalog.getString('InOut pin'),
gettextCatalog.getString('\"Inout\" pin'),
inoutValue, //-- Default value
2 //-- Field id
);
Expand Down Expand Up @@ -1642,7 +1642,7 @@ angular.module('icestudio')
//-- Field 3: InputOutput port names at the left
if (portsInOutLeft !== undefined) {
field3 = new TextField(
gettextCatalog.getString('InOut Left ports'), //-- Top message
gettextCatalog.getString('\"Inout\" Left ports'), //-- Top message
portsInOutLeft, //-- Default InputOutput port names at the left
3 //-- Field id
);
Expand All @@ -1654,7 +1654,7 @@ angular.module('icestudio')
//-- Field 4: InputOutput port names at the right
if (portsInOutRight !== undefined) {
field4 = new TextField(
gettextCatalog.getString('InOut Right ports'), //-- Top message
gettextCatalog.getString('\"Inout\" Right ports'), //-- Top message
portsInOutRight, //-- Default InputOutput port names at the right
4 //-- Field id
);
Expand Down Expand Up @@ -1814,7 +1814,9 @@ angular.module('icestudio')
//-- Show an error and return
evt.cancel = true;
this.resultAlert = alertify.warning(
gettextCatalog.getString('Duplicate port name:') + ' ' + portInfo.name
gettextCatalog.getString('Duplicate port name: {{name}}', {
name: portInfo.name,
})
);
return;
}
Expand Down
8 changes: 5 additions & 3 deletions app/scripts/services/tools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ angular
} else {

alertify.error(
gettextCatalog.getString("Bitstream not found: build your project first"),
gettextCatalog.getString("Bitstream not found: Build your project first"),
30
);
utils.endBlockingTask();
Expand Down Expand Up @@ -1387,7 +1387,7 @@ angular
const content = [
'<div>',
' <p id="progress-message">' +
gettextCatalog.getString("Installing") + ' ' + utils.printApioVersion(version) +
gettextCatalog.getString("Installing {{version}}", { version: utils.printApioVersion(version) }) +
' </p>',
' <br>',
' <div class="progress">',
Expand Down Expand Up @@ -1578,7 +1578,9 @@ angular
pkgName += ("@" + common.APIO_PKG_OSS_CAD_SUITE_VERSION);
}

updateProgress(gettextCatalog.getString("Apio install") + " " + pkgName, 60);
updateProgress(gettextCatalog.getString("Apio install {{name}}", {
name: pkgName
}), 60);
utils.apioInstall(pkgName, callback);
}

Expand Down
4 changes: 3 additions & 1 deletion app/scripts/services/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,9 @@ angular.module('icestudio')

if (!this.toolchainDisabled) {
// Show message only on start
alertify.message(gettextCatalog.getString('Using external Apio:') + ' ' + candidateApio, 5);
alertify.message(gettextCatalog.getString('Using external Apio: {{name}}', {
name: candidateApio
}), 5);
}
this.toolchainDisabled = true;
return coverPath(candidateApio);
Expand Down
14 changes: 8 additions & 6 deletions app/views/design.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
<div class="lFinder-advanced--toggle"></div>

<!-- Case sensitive option on/off -->
<div class="lFinder-case--option"></div>
<div class="lFinder-case--option" title="{{'Case sensitive' | translate}}"></div>

<!-- Exact match option on/off -->
<div class="lFinder-exact--option"></div>
<div class="lFinder-exact--option" title="{{'Exact match' | translate}}"></div>

<!-- Input text field -->
<input type="text" class="lFinder-field">
Expand All @@ -77,7 +77,7 @@
<div class="lFinder-advanced">

<!-- New name text entry -->
<span class="lFinder-name" translate>New Name</span>
<span class="lFinder-name" translate>New Name:</span>
<input class="lFinder-name--field"></input>

<!-- Replace one button -->
Expand Down Expand Up @@ -270,9 +270,11 @@
<!-- Basic Toolbox Pop up -->
<!------------------------------------------------------------------------>
<div id="iceToolbox">
<ul class="dropdown-menu">
<div class="title-bar">Basic Toolbox</div>
<div class="closeToolbox-button"></div>
<ul class="dropdown-menu">
<div class="title-bar">
{{'Basic Toolbox' | translate}}
</div>
<div class="closeToolbox-button"></div>
<li>
<a href="" class="iceToolbox--item js-shortcut--action" data-item="input">
<div class="marker marker-blue"></div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
<!-- Label-Finder -->
<li>
<a href ng-click="showLabelFinder()">
{{ 'Label Finder' | translate }}
{{ 'Label finder' | translate }}
<span class="shortcut">
{{ 'showLabelFinder' | shortcut }}
</span>
Expand Down Expand Up @@ -474,7 +474,7 @@
<!-- View/System Info -->
<li>
<a href ng-click="showSystemInfo()">
{{ 'System Info' | translate }}</a>
{{ 'System info' | translate }}</a>
</li>

<!-- Divisor line between sections of the menu -->
Expand Down
Loading