Skip to content

Commit

Permalink
Merge branch 'release/1.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Jan 4, 2022
2 parents 1421602 + 2bd2f24 commit ecca10e
Show file tree
Hide file tree
Showing 496 changed files with 55,484 additions and 5,193 deletions.
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,31 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.6.0] - 2022-01-04
### Added
- Measure activity
- Story activity
- Support for word writing in Calligra activity
- Cookie consent screen
- Delete account buttons in privacy settings

### Changed
- Refactor activities and preferences loading

This comment has been minimized.

Copy link
@Lelik74Khimki
- Refactor browser and device detection
- Force token expiration when a local account is connected and server unavailable
- Enhancement in multiplayer mode of Memorize activity #795
- Position of scrollbar in listview is saved #945

### Fixed
- Name and XO visible even after removing in Memorize Activity #794
- Calculate activity outputs incorrect error message if variable is changed in function #798
- Popup to connect local user freeze on Android/iOS
- Calligra touch responsiveness is really bad on smartphone #955
- Journal updates on favorite and name are not synchronized
- Impossible to open PDF on iOS #967
- Screen doesn't use the full size on iPhone X #968


## [1.5.0] - 2021-04-27
### Added
- DollarStreet activity
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ To run **Sugarizer Application on iOS**, download it on [Apple Store](https://it
![](images/applestore.png)

To run **Sugarizer Application on GNU Linux/Mac OS/Windows**, download it [here](https://sugarizer.org#desktop).
The Sugarizer desktop application has three possible arguments:
The Sugarizer desktop application has four possible arguments:

* `--window` to open Sugarizer in a window (instead of fullscreen)
* `--debug` to open Sugarizer with the debug console
Expand Down Expand Up @@ -202,10 +202,15 @@ To run unit tests for Sugarizer Application, run "file:///PathToYourSugarizerRep

Sugarizer Application could be packaged as an Android or iOS application using [Cordova](http://cordova.apache.org/).

For Android:

A dedicated tool named [Sugarizer APK Builder](https://github.com/llaske/sugarizer-apkbuilder) allow you to create the Android packaging without any Android knowledge.

If you want to build it yourself, you could adapt the [source code](https://github.com/llaske/sugarizer-apkbuilder/blob/master/src/make_android.sh) of this tool.

For iOS:

Refer [this](docs/ios/ios_doc.md) documentation for building sugarizer for iOS.

# Reduce package size

Expand Down
4 changes: 3 additions & 1 deletion activities.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
{"id": "org.sugarlabs.CalculateActivity", "name": "Calculate", "version": 1, "directory": "activities/Calculate.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.TurtleBlocksJS", "name": "Turtle Blocks JS", "version": 1, "directory": "activities/TurtleBlocksJS.activity", "icon": "activity/activity-icon.svg", "favorite": false, "activityId": null},
{"id": "org.sugarlabs.Clock", "name": "Clock Web", "version": 1, "directory": "activities/Clock.activity", "icon": "activity/activity-clock.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.Story", "name": "Story", "version": 1, "directory": "activities/Story.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.SpeakActivity", "name": "Speak", "favorite": true, "version": 1, "directory": "activities/Speak.activity", "icon": "activity/activity-icon.svg", "activityId": null},
{"id": "org.sugarlabs.moon", "name": "Moon", "version": 1, "directory": "activities/Moon.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.olpcfrance.RecordActivity", "name": "Record", "version": 1, "directory": "activities/Record.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
Expand Down Expand Up @@ -53,6 +54,7 @@
{"id": "org.sugarlabs.Constellation", "name": "Constellation", "version": 1, "directory": "activities/Constellation.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.Write", "name": "Write", "version": 1, "directory": "activities/Write.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.Planets", "name": "Planets", "version": 1, "directory": "activities/Planets.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.Implode", "name": "Implode", "version": 1, "directory": "activities/Implode.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null}
{"id": "org.sugarlabs.Implode", "name": "Implode", "version": 1, "directory": "activities/Implode.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.Measure", "name": "Measure", "version": 1, "directory": "activities/Measure.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null}

]
32 changes: 16 additions & 16 deletions activities/Abacus.activity/po/template.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: Sun Apr 11 2021 11:04:41 GMT+0200 (heure d’été d’Europe centrale)\n"
"POT-Creation-Date: Sat May 08 2021 21:56:08 GMT+0200 (heure d’été d’Europe centrale)\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -16,75 +16,75 @@ msgstr ""
#: TutoPrev
msgctxt "TutoPrev"
msgid "Prev"
msgstr ""
msgstr "Prev"

#: TutoNext
msgctxt "TutoNext"
msgid "Next"
msgstr ""
msgstr "Next"

#: TutoEnd
msgctxt "TutoEnd"
msgid "End"
msgstr ""
msgstr "End"

#: TutoExplainTitle
msgctxt "TutoExplainTitle"
msgid "Abacus Activity"
msgstr ""
msgstr "Abacus Activity"

#: TutoExplainContent
msgctxt "TutoExplainContent"
msgid "Welcome into the Abacus activity. Abacus lets the learner explore different representations of numbers using different mechanical counting systems developed by the ancient Romans and Chinese"
msgstr ""
msgstr "Welcome into the Abacus activity. Abacus lets the learner explore different representations of numbers using different mechanical counting systems developed by the ancient Romans and Chinese"

#: TutoAbacusTitle
msgctxt "TutoAbacusTitle"
msgid "Abacus Choice"
msgstr ""
msgstr "Abacus Choice"

#: TutoAbacusContent
msgctxt "TutoAbacusContent"
msgid "Click here to select the type of Abacus to use. Some Abacus handle decimals, some handle fractions, some handle number in base 2 and you could even create your own abacus"
msgstr ""
msgstr "Click here to select the type of Abacus to use. Some Abacus handle decimals, some handle fractions, some handle number in base 2 and you could even create your own abacus"

#: TutoCustomTitle
msgctxt "TutoCustomTitle"
msgid "Custom"
msgstr ""
msgstr "Custom"

#: TutoCustomContent
msgctxt "TutoCustomContent"
msgid "Click here to create a custom abacus. You could define number of rods, lines and base"
msgstr ""
msgstr "Click here to create a custom abacus. You could define number of rods, lines and base"

#: TutoCopyTitle
msgctxt "TutoCopyTitle"
msgid "Copy"
msgstr ""
msgstr "Copy"

#: TutoCopyContent
msgctxt "TutoCopyContent"
msgid "Click here to copy the current value into the clipboard"
msgstr ""
msgstr "Click here to copy the current value into the clipboard"

#: TutoClearTitle
msgctxt "TutoClearTitle"
msgid "Clear"
msgstr ""
msgstr "Clear"

#: TutoClearContent
msgctxt "TutoClearContent"
msgid "Click here to reinit the value of abacus to 0"
msgstr ""
msgstr "Click here to reinit the value of abacus to 0"

#: TutoCanvasTitle
msgctxt "TutoCanvasTitle"
msgid "Abacus"
msgstr ""
msgstr "Abacus"

#: TutoCanvasContent
msgctxt "TutoCanvasContent"
msgid "Here is the abacus. Click or drag the beads toward the central zone to set numbers"
msgstr ""
msgstr "Here is the abacus. Click or drag the beads toward the central zone to set numbers"

Loading

0 comments on commit ecca10e

Please sign in to comment.