diff --git a/www/index.html b/www/index.html index bbc3c703aa87a2d40b61840eba82f5240963387a..377657ecbefbcf897f5f3b4e4081e5369f30178d 100644 --- a/www/index.html +++ b/www/index.html @@ -137,7 +137,6 @@ <script src="dist/dist_js/plugins/es/js/services/comment-services.js"></script> <script src="dist/dist_js/plugins/es/js/services/http-services.js"></script> <script src="dist/dist_js/plugins/es/js/services/settings-services.js"></script> - <script src="dist/dist_js/plugins/es/js/services/market-services.js"></script> <script src="dist/dist_js/plugins/es/js/services/registry-services.js"></script> <script src="dist/dist_js/plugins/es/js/services/social-services.js"></script> <script src="dist/dist_js/plugins/es/js/services/crypto-services.js"></script> @@ -156,7 +155,6 @@ <script src="dist/dist_js/plugins/es/js/controllers/currency-controllers.js"></script> <script src="dist/dist_js/plugins/es/js/controllers/wallet-controllers.js"></script> <script src="dist/dist_js/plugins/es/js/controllers/wot-controllers.js"></script> - <script src="dist/dist_js/plugins/es/js/controllers/market-controllers.js"></script> <script src="dist/dist_js/plugins/es/js/controllers/registry-controllers.js"></script> <script src="dist/dist_js/plugins/es/js/controllers/profile-controllers.js"></script> <script src="dist/dist_js/plugins/es/js/controllers/message-controllers.js"></script> diff --git a/www/js/config.js b/www/js/config.js index 609c2f9b5bf01a9d531126e88ddf5c56d40e9e20..d49f4b727f088bfa2a15b8c027a1a21af2794483 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -60,7 +60,7 @@ angular.module("cesium.config", []) } }, "version": "0.13.0", - "build": "2017-06-21T15:10:10.340Z", + "build": "2017-06-21T15:14:32.075Z", "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" }) diff --git a/www/plugins/es/i18n/locale-fr-FR.json b/www/plugins/es/i18n/locale-fr-FR.json index 6ebf4834f99d044853fc7d0f7c52481c237c4c31..f2e7a7285c1fdd11eabb36146d1634ef267b78f4 100644 --- a/www/plugins/es/i18n/locale-fr-FR.json +++ b/www/plugins/es/i18n/locale-fr-FR.json @@ -19,8 +19,7 @@ } }, "MENU": { - "MARKET": "Annonces", - "REGISTRY": "Professionnels", + "REGISTRY": "Pages", "USER_PROFILE": "Mon profil", "MESSAGES": "Messages", "NOTIFICATIONS": "Notifications", @@ -362,7 +361,9 @@ "LOOKUP_RECORDS_FAILED": "Erreur lors de l'execution de la recherche.", "REMOVE_RECORD_FAILED": "Erreur de la suppression de la page", "SAVE_RECORD_FAILED": "Erreur lors de la sauvegarde", - "RECORD_NOT_EXISTS": "Page inexistante" + "RECORD_NOT_EXISTS": "Page inexistante", + "FAILED_SAVE_COMMENT": "Erreur lors de la sauvegarde du commentaire", + "FAILED_REMOVE_COMMENT": "Erreur lors de la suppression du commentaire" }, "INFO": { "RECORD_REMOVED" : "Page supprimée" diff --git a/www/plugins/es/js/controllers/common-controllers.js b/www/plugins/es/js/controllers/common-controllers.js index 325de74b60de46e6d86e982f58866b0871a9715f..f6aa969ae8a31ae1205eab33ba0e7b56215e9ef9 100644 --- a/www/plugins/es/js/controllers/common-controllers.js +++ b/www/plugins/es/js/controllers/common-controllers.js @@ -202,7 +202,7 @@ function ESCommentsController($scope, $timeout, $filter, $state, $focus, UIUtils $scope.focusNewComment(); return $scope.service.save($scope.id, $scope.comments, comment); }) - .catch(UIUtils.onError('MARKET.ERROR.FAILED_SAVE_COMMENT')); + .catch(UIUtils.onError('REGISTRY.ERROR.FAILED_SAVE_COMMENT')); }; $scope.share = function(event, comment) { diff --git a/www/plugins/es/templates/registry/lookup_lg.html b/www/plugins/es/templates/registry/lookup_lg.html index a1923727ba632ff1b58f9c0b930e4943d629810c..27fefea26182a97665207e3a3ffcf42573f5e05c 100644 --- a/www/plugins/es/templates/registry/lookup_lg.html +++ b/www/plugins/es/templates/registry/lookup_lg.html @@ -30,7 +30,7 @@ </label> <!-- options --> - <ng-include src="'plugins/es/templates/market/lookup_options.html'"></ng-include> + <ng-include src="'plugins/es/templates/registry/lookup_options.html'"></ng-include> </form> <div class="padding-top padding-xs" style="display: block; height: 60px;"> diff --git a/www/plugins/es/templates/subscription/modal_subscription_type.html b/www/plugins/es/templates/subscription/modal_subscription_type.html deleted file mode 100644 index 55eea49c00e23e2ac58b475873ed222169872f9f..0000000000000000000000000000000000000000 --- a/www/plugins/es/templates/subscription/modal_subscription_type.html +++ /dev/null @@ -1,18 +0,0 @@ -<ion-modal-view> - <ion-header-bar class="bar-positive"> - <button class="button button-clear" ng-click="closeModal()" translate>COMMON.BTN_CANCEL</button> - <h1 class="title" translate>SUBSCRIPTION.TYPE.TITLE</h1> - </ion-header-bar> - - <ion-content class="lookupForm"> - <div class="list padding"> - <h3 translate>SUBSCRIPTION.TYPE.SELECT_TYPE</h3> - <button class="button button-block button-stable icon icon-left cion-market-offer" - ng-click="closeModal('offer')" - translate>SUBSCRIPTION.TYPE.OFFER</button> - <button class="button button-block button-stable icon icon-left cion-market-need" - ng-click="closeModal('need')" - translate>MARKET.TYPE.NEED</button> - </div> -</ion-content> -</ion-modal-view>